Merge branch 'master' of https://github.com/codingbychanche/Beam-Calc

Author: codingbychanche

.idea/workspace.xml

@@ -0,0 +1 @@
+,Berthold,Bertholds-MacBook-Pro.local,13.02.2021 14:15,file:///Users/Berthold/Library/Application%20Support/OpenOffice/4;

Icons/.~lock.Vorlage_Icon.odg#

@@ -1,2 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/media/berthold/Bertholds Zeug/myCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/assets"><file name="beamCalcInfoFile-de.html" path="/media/berthold/Bertholds Zeug/myCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/assets/beamCalcInfoFile-de.html"/><file name="beamCalcInfoFile-en.html" path="/media/berthold/Bertholds Zeug/myCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/assets/beamCalcInfoFile-en.html"/></source><source path="/media/berthold/Bertholds Zeug/myCode/AndroidStudioProjects/MyApps/Beam-Calc/app/build/intermediates/shader_assets/debug/out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/media/berthold/Bertholds Zeug/myCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/debug/assets"/></dataSet></merger>
+<<<<<<< HEAD
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/media/berthold/Bertholds Zeug/myCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/assets"><file name="beamCalcInfoFile-de.html" path="/media/berthold/Bertholds Zeug/myCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/assets/beamCalcInfoFile-de.html"/><file name="beamCalcInfoFile-en.html" path="/media/berthold/Bertholds Zeug/myCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/assets/beamCalcInfoFile-en.html"/></source><source path="/media/berthold/Bertholds Zeug/myCode/AndroidStudioProjects/MyApps/Beam-Calc/app/build/intermediates/shader_assets/debug/out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/media/berthold/Bertholds Zeug/myCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/debug/assets"/></dataSet></merger>
+=======
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/src/main/assets"><file name="beamCalcInfoFile-de.html" path="/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/src/main/assets/beamCalcInfoFile-de.html"/><file name="beamCalcInfoFile-en.html" path="/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/src/main/assets/beamCalcInfoFile-en.html"/></source><source path="/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/build/intermediates/shader_assets/debug/out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/src/debug/assets"/></dataSet></merger>
+>>>>>>> 23600157fc9e14b8764bfdedd7ec045702c933f0

Readme.md

@@ -1,2 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/media/berthold/Bertholds Zeug/myCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/media/berthold/Bertholds Zeug/myCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/debug/jniLibs"/></dataSet></merger>
+<<<<<<< HEAD
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/media/berthold/Bertholds Zeug/myCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/media/berthold/Bertholds Zeug/myCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/debug/jniLibs"/></dataSet></merger>
+=======
+<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/src/main/jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/src/debug/jniLibs"/></dataSet></merger>
+>>>>>>> 23600157fc9e14b8764bfdedd7ec045702c933f0

app/.DS_Store

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 #Sun Feb 21 13:25:01 CET 2021
 /media/berthold/Bertholds\ Zeug/myCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/res/layout/activity_info.xml=/media/berthold/Bertholds Zeug/myCode/AndroidStudioProjects/MyApps/Beam-Calc/app/build/intermediates/res/merged/debug/layout_activity_info.xml.flat
 /media/berthold/Bertholds\ Zeug/myCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/res/layout/fragment_custom_dialog_yes_no.xml=/media/berthold/Bertholds Zeug/myCode/AndroidStudioProjects/MyApps/Beam-Calc/app/build/intermediates/res/merged/debug/layout_fragment_custom_dialog_yes_no.xml.flat
@@ -32,3 +33,39 @@
 /media/berthold/Bertholds\ Zeug/myCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/res/drawable/icon.png=/media/berthold/Bertholds Zeug/myCode/AndroidStudioProjects/MyApps/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_icon.png.flat
 /media/berthold/Bertholds\ Zeug/myCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/res/drawable/nopicture.png=/media/berthold/Bertholds Zeug/myCode/AndroidStudioProjects/MyApps/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_nopicture.png.flat
 /media/berthold/Bertholds\ Zeug/myCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/res/drawable/calculator.png=/media/berthold/Bertholds Zeug/myCode/AndroidStudioProjects/MyApps/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_calculator.png.flat
+=======
+#Sat Feb 13 16:20:08 CET 2021
+/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/src/main/res/drawable/baseline_keyboard_arrow_up_black_18dp.png=/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_baseline_keyboard_arrow_up_black_18dp.png.flat
+/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/src/main/res/drawable/support.png=/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_support.png.flat
+/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/src/main/res/layout/activity_save_beam_drawing.xml=/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/build/intermediates/res/merged/debug/layout_activity_save_beam_drawing.xml.flat
+/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/src/main/res/layout-land/activity_main.xml=/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/build/intermediates/res/merged/debug/layout-land_activity_main.xml.flat
+/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/src/main/res/layout/fragment_load_input.xml=/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/build/intermediates/res/merged/debug/layout_fragment_load_input.xml.flat
+/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/src/main/res/layout/activity_info.xml=/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/build/intermediates/res/merged/debug/layout_activity_info.xml.flat
+/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/src/main/res/drawable/baseline_keyboard_arrow_down_black_18dp.png=/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_baseline_keyboard_arrow_down_black_18dp.png.flat
+/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/src/main/res/drawable/show_result_on.png=/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_show_result_on.png.flat
+/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/src/main/res/drawable/raster_off.png=/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_raster_off.png.flat
+/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/src/main/res/drawable/document.png=/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_document.png.flat
+/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/src/main/res/drawable/camera.png=/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_camera.png.flat
+/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/src/main/res/drawable/raster_on.png=/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_raster_on.png.flat
+/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/src/main/res/drawable/show_result_off.png=/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_show_result_off.png.flat
+/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/src/main/res/drawable/leading_signs.png=/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_leading_signs.png.flat
+/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/src/main/res/drawable/show_detailed_solution_off.png=/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_show_detailed_solution_off.png.flat
+/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/src/main/res/drawable/show_dim_on.png=/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_show_dim_on.png.flat
+/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/src/main/res/drawable/fixedsupport.png=/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_fixedsupport.png.flat
+/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/src/main/res/layout/content_main.xml=/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/build/intermediates/res/merged/debug/layout_content_main.xml.flat
+/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/src/main/res/drawable/show_dim_off.png=/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_show_dim_off.png.flat
+/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/src/main/res/layout/activity_main.xml=/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/build/intermediates/res/merged/debug/layout_activity_main.xml.flat
+/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/src/main/res/layout-land/content_main.xml=/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/build/intermediates/res/merged/debug/layout-land_content_main.xml.flat
+/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/src/main/res/drawable/arrowdown.png=/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_arrowdown.png.flat
+/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/src/main/res/drawable/show_detailed_solution_select.png=/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_show_detailed_solution_select.png.flat
+/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/src/main/res/drawable/calculator.png=/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_calculator.png.flat
+/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/src/main/res/drawable/add_load_icon.png=/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_add_load_icon.png.flat
+/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/src/main/res/layout/fragment_custom_dialog_yes_no.xml=/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/build/intermediates/res/merged/debug/layout_fragment_custom_dialog_yes_no.xml.flat
+/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/src/main/res/drawable/openfolder.png=/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_openfolder.png.flat
+/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/src/main/res/drawable/arrowup.png=/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_arrowup.png.flat
+/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/src/main/res/menu/menu_main.xml=/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/build/intermediates/res/merged/debug/menu_menu_main.xml.flat
+/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/src/main/res/drawable/icon.png=/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_icon.png.flat
+/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/src/main/res/layout/load_list_row.xml=/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/build/intermediates/res/merged/debug/layout_load_list_row.xml.flat
+/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/src/main/res/mipmap-xxxhdpi/icon.png=/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/build/intermediates/res/merged/debug/mipmap-xxxhdpi_icon.png.flat
+/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/src/main/res/drawable/nopicture.png=/Users/Berthold/Documents/MyCode/AndroidStudio/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_nopicture.png.flat
+>>>>>>> 23600157fc9e14b8764bfdedd7ec045702c933f0