Skip to content

Commit 930360a

Browse files
codingbychanchecodingbychanche
committed
Version 1.3.
Adjusted text size in graphical representation of the solution. Text is now better readable especially on smaller screens. Created a dedicated dialog for load input. Dimensions are now shown permanently. The resulting forces and the mathematical term showing the detailed solution can no be shown or hidden by tapping just one dedicated icon.
1 parent e545e59 commit 930360a

File tree

286 files changed

+703
-10683
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

286 files changed

+703
-10683
lines changed

‎.gradle/6.5/executionHistory/executionHistory.bin

373 KB
Binary file not shown.

‎.gradle/6.5/executionHistory/executionHistory.lock

0 Bytes
Binary file not shown.

‎.gradle/6.5/fileHashes/fileHashes.bin

4.1 KB
Binary file not shown.

‎.gradle/6.5/fileHashes/fileHashes.lock

0 Bytes
Binary file not shown.

‎.gradle/6.5/fileHashes/resourceHashesCache.bin

68 Bytes
Binary file not shown.

‎.gradle/6.5/javaCompile/classAnalysis.bin

34 KB
Binary file not shown.

‎.gradle/6.5/javaCompile/jarAnalysis.bin

74.7 KB
Binary file not shown.

‎.gradle/6.5/javaCompile/javaCompile.lock

0 Bytes
Binary file not shown.

‎.gradle/6.5/javaCompile/taskHistory.bin

0 Bytes
Binary file not shown.

‎.gradle/buildOutputCleanup/buildOutputCleanup.lock

0 Bytes
Binary file not shown.

‎.gradle/buildOutputCleanup/outputFiles.bin

19 KB
Binary file not shown.

‎.gradle/checksums/checksums.lock

0 Bytes
Binary file not shown.

‎.gradle/checksums/sha1-checksums.bin

486 Bytes
Binary file not shown.

‎.idea/caches/build_file_checksums.ser

0 Bytes
Binary file not shown.

‎.idea/libraries/Gradle__com_github_codingbychanche_FileDialogTool__SNAPSHOT_aar.xml

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Publications/2019_04_23_V1_0B/Anleitung_.pdf renamed to ‎Instructions/2019_04_23_V1_0B/Anleitung_.pdf

File renamed without changes.

‎Instructions/Screenshoots/German/V1_1B/BeamCalcMainActivity.png renamed to ‎Instructions/2019_04_23_V1_0B/BeamCalcMainActivity.png

File renamed without changes.

‎Instructions/Screenshoots/German/V1_1B/BeamCalcMainActivityFullScreen.png renamed to ‎Instructions/2019_04_23_V1_0B/Screenshots_DE/BeamCalcMainActivityFullScreen.png

File renamed without changes.

‎Instructions/Screenshoots/German/V1_1B/BeamCalcMainActivityFullWIthMenu.png renamed to ‎Instructions/2019_04_23_V1_0B/Screenshots_DE/BeamCalcMainActivityFullWIthMenu.png

File renamed without changes.

‎Instructions/Screenshoots/German/V1_1B/LoesungMitFormel.png renamed to ‎Instructions/2019_04_23_V1_0B/Screenshots_DE/LoesungMitFormel.png

File renamed without changes.

‎Instructions/Screenshoots/German/V1_1B/MainActivitySaveDialog_1.png renamed to ‎Instructions/2019_04_23_V1_0B/Screenshots_DE/MainActivitySaveDialog_1.png

File renamed without changes.

‎Instructions/Screenshoots/German/V1_1B/MainActivitySaveScreen.png renamed to ‎Instructions/2019_04_23_V1_0B/Screenshots_DE/MainActivitySaveScreen.png

File renamed without changes.

‎Instructions/Screenshoots/German/V1_1B/MainActivitySave_2.png renamed to ‎Instructions/2019_04_23_V1_0B/Screenshots_DE/MainActivitySave_2.png

File renamed without changes.

‎Instructions/Screenshoots/German/V1_1B/Main_Save.png renamed to ‎Instructions/2019_04_23_V1_0B/Screenshots_DE/Main_Save.png

File renamed without changes.

‎Instructions/Screenshoots/German/V1_1B/SampleBeamWithSolution.png renamed to ‎Instructions/2019_04_23_V1_0B/Screenshots_DE/SampleBeamWithSolution.png

File renamed without changes.

‎Instructions/Screenshoots/German/V1_1B/Save_Activitydevice-2019-04-23-170336.png renamed to ‎Instructions/2019_04_23_V1_0B/Screenshots_DE/Save_Activitydevice-2019-04-23-170336.png

File renamed without changes.

‎Instructions/Screenshoots/German/V1_1B/Screenshot_20200429-103140.png renamed to ‎Instructions/2019_04_23_V1_0B/Screenshots_DE/Screenshot_20200429-103140.png

File renamed without changes.

‎Instructions/Screenshoots/German/V1_1B/device-2019-04-24-191705.png renamed to ‎Instructions/2019_04_23_V1_0B/Screenshots_DE/device-2019-04-24-191705.png

File renamed without changes.

‎Instructions/Screenshoots/German/V1_1B/device-2019-04-24-191843.png renamed to ‎Instructions/2019_04_23_V1_0B/Screenshots_DE/device-2019-04-24-191843.png

File renamed without changes.

‎Instructions/Screenshoots/German/V1_1B/device-2019-04-24-192031.png renamed to ‎Instructions/2019_04_23_V1_0B/Screenshots_DE/device-2019-04-24-192031.png

File renamed without changes.

‎Instructions/Screenshoots/German/V1_1B/device-2019-04-24-193302.png renamed to ‎Instructions/2019_04_23_V1_0B/Screenshots_DE/device-2019-04-24-193302.png

File renamed without changes.

‎Instructions/Screenshoots/German/V1_1B/device-2019-04-24-193835.png renamed to ‎Instructions/2019_04_23_V1_0B/Screenshots_DE/device-2019-04-24-193835.png

File renamed without changes.

‎Instructions/Screenshoots/German/V1_1B/device-2019-04-24-194412.png renamed to ‎Instructions/2019_04_23_V1_0B/Screenshots_DE/device-2019-04-24-194412.png

File renamed without changes.

‎Instructions/Screenshoots/German/V1_1B/device-2019-04-24-195255.png renamed to ‎Instructions/2019_04_23_V1_0B/Screenshots_DE/device-2019-04-24-195255.png

File renamed without changes.

‎Instructions/Screenshoots/German/V1_1B/device-2019-04-24-200357.png renamed to ‎Instructions/2019_04_23_V1_0B/Screenshots_DE/device-2019-04-24-200357.png

File renamed without changes.

‎Instructions/Screenshoots/German/V1_1B/device-2019-04-28-213808.png renamed to ‎Instructions/2019_04_23_V1_0B/Screenshots_DE/device-2019-04-28-213808.png

File renamed without changes.

‎Instructions/Screenshoots/English/V1_1B/.DS_Store renamed to ‎Instructions/2019_04_23_V1_0B/Screenshots_EN/.DS_Store

File renamed without changes.

‎Instructions/Screenshoots/English/V1_1B/Screenshot_20200429-111914.png renamed to ‎Instructions/2019_04_23_V1_0B/Screenshots_EN/Screenshot_20200429-111914.png

File renamed without changes.

‎Instructions/Screenshoots/English/V1_1B/Screenshot_20200429-111944.png renamed to ‎Instructions/2019_04_23_V1_0B/Screenshots_EN/Screenshot_20200429-111944.png

File renamed without changes.

‎Instructions/Screenshoots/English/V1_1B/Screenshot_20200429-112436_BeamCalc.jpg renamed to ‎Instructions/2019_04_23_V1_0B/Screenshots_EN/Screenshot_20200429-112436_BeamCalc.jpg

File renamed without changes.

‎Instructions/Screenshoots/English/V1_1B/Screenshot_20200429-112444_BeamCalc.jpg renamed to ‎Instructions/2019_04_23_V1_0B/Screenshots_EN/Screenshot_20200429-112444_BeamCalc.jpg

File renamed without changes.

‎Instructions/Screenshoots/English/V1_1B/Screenshot_20200429-112513_BeamCalc.jpg renamed to ‎Instructions/2019_04_23_V1_0B/Screenshots_EN/Screenshot_20200429-112513_BeamCalc.jpg

File renamed without changes.

‎Instructions/Screenshoots/English/V1_2B/.DS_Store renamed to ‎Instructions/2020_04_29_V1_1B/.DS_Store

File renamed without changes.

‎Publications/2020_04_29_V1_1B/Anleitung_.pdf renamed to ‎Instructions/2020_04_29_V1_1B/Anleitung_.pdf

File renamed without changes.

‎Instructions/Screenshoots/German/V1_2B/phone_land.png renamed to ‎Instructions/2020_04_29_V1_1B/Screenshots_DE/phone_land.png

File renamed without changes.

‎Instructions/Screenshoots/German/V1_2B/phone_port_all.png renamed to ‎Instructions/2020_04_29_V1_1B/Screenshots_DE/phone_port_all.png

File renamed without changes.

‎Instructions/Screenshoots/English/V1_2B/phone_port_detailed_solution.png renamed to ‎Instructions/2020_04_29_V1_1B/Screenshots_DE/phone_port_detailed_solution.png

File renamed without changes.

‎Instructions/Screenshoots/German/V1_2B/phone_port_fullscreen.png renamed to ‎Instructions/2020_04_29_V1_1B/Screenshots_DE/phone_port_fullscreen.png

File renamed without changes.

‎Instructions/Screenshoots/German/V1_2B/phone_port_save_dialog.png renamed to ‎Instructions/2020_04_29_V1_1B/Screenshots_DE/phone_port_save_dialog.png

File renamed without changes.

‎Instructions/Screenshoots/German/V1_2B/phone_port_save_window.png renamed to ‎Instructions/2020_04_29_V1_1B/Screenshots_DE/phone_port_save_window.png

File renamed without changes.

‎Instructions/Screenshoots/German/V1_2B/tab_land.png renamed to ‎Instructions/2020_04_29_V1_1B/Screenshots_DE/tab_land.png

File renamed without changes.

‎Instructions/Screenshoots/German/V1_2B/tab_land_save_dialog.png renamed to ‎Instructions/2020_04_29_V1_1B/Screenshots_DE/tab_land_save_dialog.png

File renamed without changes.

‎Instructions/Screenshoots/German/V1_2B/tab_port.png renamed to ‎Instructions/2020_04_29_V1_1B/Screenshots_DE/tab_port.png

File renamed without changes.

‎Instructions/Screenshoots/German/V1_2B/tab_port_full.png renamed to ‎Instructions/2020_04_29_V1_1B/Screenshots_DE/tab_port_full.png

File renamed without changes.

‎Instructions/Screenshoots/German/V1_2B/.DS_Store renamed to ‎Instructions/2020_04_29_V1_1B/Screenshots_EN/.DS_Store

File renamed without changes.

‎Instructions/Screenshoots/English/V1_2B/phone_file_chooser.png renamed to ‎Instructions/2020_04_29_V1_1B/Screenshots_EN/phone_file_chooser.png

File renamed without changes.

‎Instructions/Screenshoots/English/V1_2B/phone_input.png renamed to ‎Instructions/2020_04_29_V1_1B/Screenshots_EN/phone_input.png

File renamed without changes.

‎Instructions/Screenshoots/English/V1_2B/phone_land.png renamed to ‎Instructions/2020_04_29_V1_1B/Screenshots_EN/phone_land.png

File renamed without changes.

‎Instructions/Screenshoots/English/V1_2B/phone_main.png renamed to ‎Instructions/2020_04_29_V1_1B/Screenshots_EN/phone_main.png

File renamed without changes.

‎Instructions/Screenshoots/German/V1_2B/phone_port_detailed_solution.png renamed to ‎Instructions/2020_04_29_V1_1B/Screenshots_EN/phone_port_detailed_solution.png

File renamed without changes.

‎Instructions/Screenshoots/English/V1_2B/phone_preview_file.png renamed to ‎Instructions/2020_04_29_V1_1B/Screenshots_EN/phone_preview_file.png

File renamed without changes.

‎Instructions/Screenshoots/English/V1_2B/phone_save.png renamed to ‎Instructions/2020_04_29_V1_1B/Screenshots_EN/phone_save.png

File renamed without changes.

‎Instructions/Screenshoots/English/V1_2B/tab_land.png renamed to ‎Instructions/2020_04_29_V1_1B/Screenshots_EN/tab_land.png

File renamed without changes.

‎Instructions/Screenshoots/English/V1_2B/tab_land_full.png renamed to ‎Instructions/2020_04_29_V1_1B/Screenshots_EN/tab_land_full.png

File renamed without changes.

‎Instructions/Screenshoots/English/V1_2B/tab_port.png renamed to ‎Instructions/2020_04_29_V1_1B/Screenshots_EN/tab_port.png

File renamed without changes.

‎Instructions/Screenshoots/English/V1_2B/tab_port_save.png renamed to ‎Instructions/2020_04_29_V1_1B/Screenshots_EN/tab_port_save.png

File renamed without changes.

‎Instructions/2021_03_18_V1_3/Anleitung_.pdf

962 KB
Binary file not shown.

‎Instructions/2021_03_18_V1_3/Screenshots_DE/Tabelet_Port_Solution.png

109 KB

‎Instructions/2021_03_18_V1_3/Screenshots_DE/Tablet_Land_Save_Menu.png

109 KB

‎Instructions/2021_03_18_V1_3/Screenshots_DE/Tablet_Land_Save_Screen.png

102 KB

‎Instructions/2021_03_18_V1_3/Screenshots_DE/Tablet_Port_Beam_Input.png

64.3 KB

‎Instructions/2021_03_18_V1_3/Screenshots_DE/Tablet_Port_Dialog_Overwrite.png

69.3 KB

‎Instructions/2021_03_18_V1_3/Screenshots_DE/Tablet_Port_FileDialog.png

158 KB

‎Instructions/2021_03_18_V1_3/Screenshots_DE/Tablet_Port_FileNameDialog.png

109 KB

‎Instructions/2021_03_18_V1_3/Screenshots_DE/Tablet_Port_FullScreen.png

66.1 KB

‎Instructions/2021_03_18_V1_3/Screenshots_DE/Tablet_Port_Load_Input.png

105 KB

‎Instructions/2021_03_18_V1_3/Screenshots_DE/Tablet_Port_Save_Dialog.png

95.9 KB

‎Instructions/2021_03_18_V1_3/Screenshots_EN/Tablet_Land_Main.png

119 KB

‎Instructions/2021_03_18_V1_3/Screenshots_EN/Tablet_Port_Load_Input.png

122 KB

‎Instructions/2021_03_18_V1_3/Screenshots_EN/Tablet_Port_Main.png

115 KB

‎Instructions/Screenshoots/German/Access_.png renamed to ‎Instructions/Access_.png

File renamed without changes.

‎Instructions/Screenshoots/German/Access_2.png renamed to ‎Instructions/Access_2.png

File renamed without changes.

‎Instructions/Anleitung_.odt

663 KB
Binary file not shown.

‎Instructions/Screenshoots/.DS_Store

-10 KB
Binary file not shown.

‎Instructions/Screenshoots/English/.DS_Store

-14 KB
Binary file not shown.

‎Instructions/Screenshoots/English/V1_3/device-2021-02-21-140311.png

-72.1 KB
Binary file not shown.

‎Instructions/Screenshoots/German/.DS_Store

-6 KB
Binary file not shown.

‎Instructions/Screenshoots/German/V1_3/device-2021-02-21-140311.png

-72.1 KB
Binary file not shown.

‎Instructions/Screenshoots/German/Settings_Screen.png renamed to ‎Instructions/Settings_Screen.png

File renamed without changes.

‎Instructions/Screenshoots/German/allow_unknown_sources.png renamed to ‎Instructions/allow_unknown_sources.png

File renamed without changes.

‎Publications/.DS_Store

-14 KB
Binary file not shown.

‎Publications/2019_04_23_V1_0B/.DS_Store

-6 KB
Binary file not shown.

‎Publications/2019_04_23_V1_0B/BeamCalc.apk

-1.73 MB
Binary file not shown.

‎app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar

-53 Bytes
Binary file not shown.

‎app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex

0 Bytes
Binary file not shown.

‎app/build/intermediates/dex/debug/mergeProjectDexDebug/classes.dex

-1.85 KB
Binary file not shown.

‎app/build/intermediates/dex_archive_input_jar_hashes/debug/out

0 Bytes
Binary file not shown.

‎app/build/intermediates/incremental/mergeDebugAssets/merger.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<<<<<<< HEAD
3-
<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>
4-
=======
5-
<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>
6-
>>>>>>> 23600157fc9e14b8764bfdedd7ec045702c933f0
2+
<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>

‎app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<<<<<<< HEAD
3-
<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>
4-
=======
5-
<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>
6-
>>>>>>> 23600157fc9e14b8764bfdedd7ec045702c933f0
2+
<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>

‎app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<<<<<<< HEAD
2-
#Sun Feb 21 13:25:01 CET 2021
1+
#Thu Mar 18 17:04:26 CET 2021
32
/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
43
/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
54
/media/berthold/Bertholds\ Zeug/myCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/res/drawable/arrowup.png=/media/berthold/Bertholds Zeug/myCode/AndroidStudioProjects/MyApps/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_arrowup.png.flat
@@ -33,39 +32,3 @@
3332
/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
3433
/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
3534
/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
36-
=======
37-
#Sat Feb 13 16:20:08 CET 2021
38-
/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
39-
/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
40-
/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
41-
/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
42-
/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
43-
/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
44-
/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
45-
/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
46-
/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
47-
/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
48-
/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
49-
/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
50-
/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
51-
/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
52-
/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
53-
/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
54-
/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
55-
/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
56-
/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
57-
/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
58-
/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
59-
/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
60-
/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
61-
/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
62-
/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
63-
/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
64-
/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
65-
/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
66-
/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
67-
/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
68-
/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
69-
/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
70-
/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
71-
>>>>>>> 23600157fc9e14b8764bfdedd7ec045702c933f0

0 commit comments

Comments
 (0)