Skip to content

Commit 0b3edf6

Browse files
codingbychanchecodingbychanche
committed
Improved UI
1 parent e7f49ec commit 0b3edf6

File tree

30 files changed

+72
-63
lines changed

30 files changed

+72
-63
lines changed

‎.gradle/6.5/executionHistory/executionHistory.bin

0 Bytes
Binary file not shown.

‎.gradle/6.5/executionHistory/executionHistory.lock

0 Bytes
Binary file not shown.

‎.gradle/6.5/fileHashes/fileHashes.bin

0 Bytes
Binary file not shown.

‎.gradle/6.5/fileHashes/fileHashes.lock

0 Bytes
Binary file not shown.

‎.gradle/6.5/javaCompile/classAnalysis.bin

76 Bytes
Binary file not shown.

‎.gradle/6.5/javaCompile/javaCompile.lock

0 Bytes
Binary file not shown.

‎.gradle/buildOutputCleanup/buildOutputCleanup.lock

0 Bytes
Binary file not shown.

‎.gradle/checksums/checksums.lock

0 Bytes
Binary file not shown.

‎.gradle/checksums/sha1-checksums.bin

162 Bytes
Binary file not shown.

‎app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ android {
66
applicationId "berthold.beamcalc"
77
minSdkVersion 23
88
targetSdkVersion 30
9-
versionCode 25
10-
versionName "2.5"
9+
versionCode 26
10+
versionName "2.6"
1111
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1212
}
1313
buildTypes {

‎app/build/generated/source/buildConfig/debug/berthold/beamcalc/BuildConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ public final class BuildConfig {
77
public static final boolean DEBUG = Boolean.parseBoolean("true");
88
public static final String APPLICATION_ID = "berthold.beamcalc";
99
public static final String BUILD_TYPE = "debug";
10-
public static final int VERSION_CODE = 24;
11-
public static final String VERSION_NAME = "2.4";
10+
public static final int VERSION_CODE = 26;
11+
public static final String VERSION_NAME = "2.6";
1212
}

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

0 Bytes
Binary file not shown.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#Mon Mar 07 22:22:40 CET 2022
1+
#Sat Mar 26 20:06:25 CET 2022
22
/media/berthold/Bertholds\ Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/res/layout/load_list_row.xml=/media/berthold/Bertholds Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/build/intermediates/res/merged/debug/layout_load_list_row.xml.flat
33
/media/berthold/Bertholds\ Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/res/layout/content_main.xml=/media/berthold/Bertholds Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/build/intermediates/res/merged/debug/layout_content_main.xml.flat
44
/media/berthold/Bertholds\ Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/res/drawable/raster_on.png=/media/berthold/Bertholds Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_raster_on.png.flat
@@ -23,12 +23,12 @@
2323
/media/berthold/Bertholds\ Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/res/drawable/show_detailed_solution_off.png=/media/berthold/Bertholds Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_show_detailed_solution_off.png.flat
2424
/media/berthold/Bertholds\ Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/res/drawable/camera.png=/media/berthold/Bertholds Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_camera.png.flat
2525
/media/berthold/Bertholds\ Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/res/layout/activity_main.xml=/media/berthold/Bertholds Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/build/intermediates/res/merged/debug/layout_activity_main.xml.flat
26-
/media/berthold/Bertholds\ Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/res/drawable/baseline_keyboard_arrow_down_black_18dp.png=/media/berthold/Bertholds Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_baseline_keyboard_arrow_down_black_18dp.png.flat
2726
/media/berthold/Bertholds\ Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/res/drawable/baseline_keyboard_arrow_up_black_18dp.png=/media/berthold/Bertholds Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_baseline_keyboard_arrow_up_black_18dp.png.flat
27+
/media/berthold/Bertholds\ Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/res/drawable/baseline_keyboard_arrow_down_black_18dp.png=/media/berthold/Bertholds Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_baseline_keyboard_arrow_down_black_18dp.png.flat
2828
/media/berthold/Bertholds\ Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/res/drawable/leading_signs.png=/media/berthold/Bertholds Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_leading_signs.png.flat
2929
/media/berthold/Bertholds\ Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/res/drawable/fixedsupport.png=/media/berthold/Bertholds Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_fixedsupport.png.flat
3030
/media/berthold/Bertholds\ Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/res/menu/menu_main.xml=/media/berthold/Bertholds Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/build/intermediates/res/merged/debug/menu_menu_main.xml.flat
3131
/media/berthold/Bertholds\ Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/res/drawable/show_dim_off.png=/media/berthold/Bertholds Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_show_dim_off.png.flat
32-
/media/berthold/Bertholds\ Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/res/layout/activity_save_beam_drawing.xml=/media/berthold/Bertholds Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/build/intermediates/res/merged/debug/layout_activity_save_beam_drawing.xml.flat
3332
/media/berthold/Bertholds\ Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/res/drawable/show_result_off.png=/media/berthold/Bertholds Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_show_result_off.png.flat
33+
/media/berthold/Bertholds\ Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/res/layout/activity_save_beam_drawing.xml=/media/berthold/Bertholds Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/build/intermediates/res/merged/debug/layout_activity_save_beam_drawing.xml.flat
3434
/media/berthold/Bertholds\ Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/res/layout-land/activity_main.xml=/media/berthold/Bertholds Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/build/intermediates/res/merged/debug/layout-land_activity_main.xml.flat

‎app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#Mon Mar 07 22:25:31 CET 2022
1+
#Sat Mar 26 20:06:41 CET 2022
22
base.0=/media/berthold/Bertholds Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/build/intermediates/dex/debug/mergeExtDexDebug/classes.dex
33
path.1=classes.dex
44
renamed.1=classes2.dex

‎app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources

0 Bytes
Binary file not shown.

‎app/build/intermediates/javac/debug/classes/berthold/beamcalc/BuildConfig.class

0 Bytes
Binary file not shown.

‎app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
1<?xml version="1.0" encoding="utf-8"?>
22
2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
3 package="berthold.beamcalc"
4-
4 android:versionCode="24"
5-
5 android:versionName="2.4" >
4+
4 android:versionCode="26"
5+
5 android:versionName="2.6" >
66
6
77
7 <uses-sdk
88
8 android:minSdkVersion="23"

‎app/build/intermediates/merged_manifest/debug/out/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="berthold.beamcalc"
4-
android:versionCode="24"
5-
android:versionName="2.4" >
4+
android:versionCode="26"
5+
android:versionName="2.6" >
66

77
<uses-sdk
88
android:minSdkVersion="23"

‎app/build/intermediates/merged_manifests/debug/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="berthold.beamcalc"
4-
android:versionCode="24"
5-
android:versionName="2.4" >
4+
android:versionCode="26"
5+
android:versionName="2.6" >
66

77
<uses-sdk
88
android:minSdkVersion="23"

‎app/build/intermediates/merged_manifests/debug/output-metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
{
1111
"type": "SINGLE",
1212
"filters": [],
13-
"versionCode": 24,
14-
"versionName": "2.4",
13+
"versionCode": 26,
14+
"versionName": "2.6",
1515
"outputFile": "AndroidManifest.xml"
1616
}
1717
]

‎app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"merged": "/media/berthold/Bertholds Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_calculator.png.flat",
44
"source": "/media/berthold/Bertholds Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/res/drawable/calculator.png"
55
},
6-
{
7-
"merged": "/media/berthold/Bertholds Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_add_load_icon.png.flat",
8-
"source": "/media/berthold/Bertholds Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/res/drawable/add_load_icon.png"
9-
},
106
{
117
"merged": "/media/berthold/Bertholds Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/build/intermediates/res/merged/debug/layout-land_content_main.xml.flat",
128
"source": "/media/berthold/Bertholds Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/res/layout-land/content_main.xml"
139
},
10+
{
11+
"merged": "/media/berthold/Bertholds Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_add_load_icon.png.flat",
12+
"source": "/media/berthold/Bertholds Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/res/drawable/add_load_icon.png"
13+
},
1414
{
1515
"merged": "/media/berthold/Bertholds Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/build/intermediates/res/merged/debug/mipmap-xxxhdpi_icon.png.flat",
1616
"source": "/media/berthold/Bertholds Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/res/mipmap-xxxhdpi/icon.png"
@@ -39,14 +39,14 @@
3939
"merged": "/media/berthold/Bertholds Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_arrowup.png.flat",
4040
"source": "/media/berthold/Bertholds Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/res/drawable/arrowup.png"
4141
},
42-
{
43-
"merged": "/media/berthold/Bertholds Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_show_result_off.png.flat",
44-
"source": "/media/berthold/Bertholds Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/res/drawable/show_result_off.png"
45-
},
4642
{
4743
"merged": "/media/berthold/Bertholds Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_show_result_on.png.flat",
4844
"source": "/media/berthold/Bertholds Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/res/drawable/show_result_on.png"
4945
},
46+
{
47+
"merged": "/media/berthold/Bertholds Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_show_result_off.png.flat",
48+
"source": "/media/berthold/Bertholds Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/res/drawable/show_result_off.png"
49+
},
5050
{
5151
"merged": "/media/berthold/Bertholds Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/build/intermediates/res/merged/debug/drawable_openfolder.png.flat",
5252
"source": "/media/berthold/Bertholds Zeug/NFSShare/MyCode/AndroidStudioProjects/MyApps/Beam-Calc/app/src/main/res/drawable/openfolder.png"

‎app/build/intermediates/packaged_manifests/debug/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="berthold.beamcalc"
4-
android:versionCode="24"
5-
android:versionName="2.4" >
4+
android:versionCode="26"
5+
android:versionName="2.6" >
66

77
<uses-sdk
88
android:minSdkVersion="23"

‎app/build/intermediates/packaged_manifests/debug/output-metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
{
1111
"type": "SINGLE",
1212
"filters": [],
13-
"versionCode": 24,
14-
"versionName": "2.4",
13+
"versionCode": 26,
14+
"versionName": "2.6",
1515
"outputFile": "AndroidManifest.xml"
1616
}
1717
]

‎app/build/intermediates/processed_res/debug/out/output-metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
{
1111
"type": "SINGLE",
1212
"filters": [],
13-
"versionCode": 24,
14-
"versionName": "2.4",
13+
"versionCode": 26,
14+
"versionName": "2.6",
1515
"outputFile": "resources-debug.ap_"
1616
}
1717
]

‎app/build/intermediates/processed_res/debug/out/resources-debug.ap_

56 Bytes
Binary file not shown.

‎app/build/intermediates/project_dex_archive/debug/out/berthold/beamcalc/BuildConfig.dex

0 Bytes
Binary file not shown.

‎app/build/intermediates/res/merged/debug/layout-land_content_main.xml.flat

696 Bytes
Binary file not shown.

‎app/build/outputs/apk/debug/app-debug.apk

53 Bytes
Binary file not shown.

‎app/build/outputs/apk/debug/output-metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
{
1111
"type": "SINGLE",
1212
"filters": [],
13-
"versionCode": 24,
14-
"versionName": "2.4",
13+
"versionCode": 26,
14+
"versionName": "2.6",
1515
"outputFile": "app-debug.apk"
1616
}
1717
]

‎app/src/main/res/layout-land/content_main.xml

Lines changed: 40 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -78,49 +78,58 @@
7878
android:paddingRight="5dp">
7979

8080

81-
<!-- Beam description -->
82-
83-
<TextView
84-
android:text="@string/beam_definition_title_bar"
85-
android:background="@color/lightGrey"
86-
android:textStyle="bold"
87-
android:textSize="15dp"
88-
android:paddingLeft="10dp"
89-
android:layout_width="match_parent"
90-
android:layout_height="wrap_content"/>
91-
9281
<LinearLayout
9382
android:layout_width="match_parent"
9483
android:layout_height="wrap_content"
9584
android:orientation="horizontal">
9685

97-
<EditText
98-
android:id="@+id/beam_length"
99-
android:inputType="numberSigned|numberDecimal"
100-
android:hint="@string/beam_length_hint"
101-
android:paddingLeft="10dp"
102-
android:textSize="15dp"
86+
<com.google.android.material.textfield.TextInputLayout
87+
android:id="@+id/length_layout"
10388
android:layout_width="0dp"
10489
android:layout_height="wrap_content"
105-
android:layout_weight=".5"/>
106-
107-
<EditText
108-
android:id="@+id/left_support_position"
109-
android:hint="@string/beam_left_support_hint"
110-
android:inputType="numberSigned|numberDecimal"
111-
android:textSize="15dp"
90+
android:layout_weight=".5">
91+
92+
<EditText
93+
android:id="@+id/beam_length"
94+
android:layout_width="match_parent"
95+
android:layout_height="wrap_content"
96+
android:hint="@string/beam_length_hint"
97+
android:inputType="numberSigned|numberDecimal"
98+
android:paddingLeft="10dp"
99+
android:textSize="15dp" />
100+
</com.google.android.material.textfield.TextInputLayout>
101+
102+
<com.google.android.material.textfield.TextInputLayout
103+
android:id="@+id/left_support_layout"
112104
android:layout_width="0dp"
113105
android:layout_height="wrap_content"
114-
android:layout_weight=".5"/>
106+
android:layout_weight=".5">
107+
108+
<EditText
109+
android:id="@+id/left_support_position"
110+
android:layout_width="match_parent"
111+
android:layout_height="wrap_content"
112+
android:layout_weight=".5"
113+
android:hint="@string/beam_left_support_hint"
114+
android:inputType="numberSigned|numberDecimal"
115+
android:textSize="15dp" />
116+
</com.google.android.material.textfield.TextInputLayout>
117+
115118

116-
<EditText
117-
android:id="@+id/right_support_position"
118-
android:hint="@string/beam_right_support_hint"
119-
android:inputType="numberSigned|numberDecimal"
120-
android:textSize="15dp"
119+
<com.google.android.material.textfield.TextInputLayout
120+
android:id="@+id/right_support_layout"
121121
android:layout_width="0dp"
122122
android:layout_height="wrap_content"
123-
android:layout_weight=".5"/>
123+
android:layout_weight=".5">
124+
<EditText
125+
android:id="@+id/right_support_position"
126+
android:layout_width="match_parent"
127+
android:layout_height="wrap_content"
128+
android:layout_weight=".5"
129+
android:hint="@string/beam_right_support_hint"
130+
android:inputType="numberSigned|numberDecimal"
131+
android:textSize="15dp" />
132+
</com.google.android.material.textfield.TextInputLayout>
124133

125134
</LinearLayout>
126135

0 commit comments

Comments
 (0)