Skip to content

Commit 0e280e7

Browse files
adamDilgeradamDilger
committed
update 1.5.0
Added camera functionality to Take5 form
1 parent 173c4ad commit 0e280e7

40 files changed

+1017
-535
lines changed

‎app/SEMF-0.1.apk

-3.32 MB
Binary file not shown.

‎app/SEMF.apk

-3.29 MB
Binary file not shown.

‎app/app.iml

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<facet type="android" name="Android">
1010
<configuration>
1111
<option name="SELECTED_BUILD_VARIANT" value="debug" />
12-
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1312
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1413
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
1514
<afterSyncTasks>
@@ -47,54 +46,41 @@
4746
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4847
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
4948
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
50-
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
5149
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
5250
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
5351
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
5452
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
5553
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
5654
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
5755
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
58-
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
5956
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
6057
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
6158
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
6259
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
6360
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
6461
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
6562
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
66-
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6763
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6864
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7765
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7866
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
7967
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
8068
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
8169
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
82-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
8370
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8471
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8579
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8680
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8781
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
8882
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/debug" />
9083
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.0/jars" />
93-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.1.0/jars" />
94-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.1.0/jars" />
95-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.0/jars" />
96-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.commit451/PhotoView/1.2.4/jars" />
97-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.yqritc/recyclerview-flexibledivider/1.2.8/jars" />
9884
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
9985
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
10086
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
@@ -105,14 +91,13 @@
10591
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
10692
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
10793
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
108-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/release" />
10994
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
11095
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
11196
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
11297
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
11398
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
114100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
115-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
116101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
117102
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
118103
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />

‎app/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
22

33
android {
44
compileSdkVersion 23
5-
buildToolsVersion "23.0.1"
5+
buildToolsVersion '25.0.0'
66

77
defaultConfig {
88
applicationId "com.semfapp.adamdilger.semf"
@@ -11,6 +11,7 @@ android {
1111
}
1212
buildTypes {
1313
release {
14+
shrinkResources true
1415
minifyEnabled false
1516
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1617
}

‎app/src/main/AndroidManifest.xml

Lines changed: 8 additions & 12 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="com.semfapp.adamdilger.semf"
4-
android:versionCode="9"
5-
android:versionName="1.4.3">
4+
android:versionCode="10"
5+
android:versionName="1.5.0">
66

77
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
88
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@ -20,8 +20,7 @@
2020
android:theme="@style/AppTheme" >
2121
<activity
2222
android:name=".MainActivity"
23-
android:label="@string/app_name"
24-
android:theme="@style/AppTheme.NoActionBar" >
23+
android:label="@string/app_name" >
2524
<intent-filter>
2625
<action android:name="android.intent.action.MAIN" />
2726

@@ -31,46 +30,43 @@
3130
<activity
3231
android:name=".userProfileActivity"
3332
android:label="@string/title_activity_user_profile"
34-
android:theme="@style/AppTheme.NoActionBar"
3533
android:windowSoftInputMode="adjustResize">
3634
</activity>
3735
<activity
3836
android:name=".protectPlanActivity"
3937
android:label="@string/title_activity_protect_plan"
40-
android:theme="@style/AppTheme.NoActionBar"
4138
android:windowSoftInputMode="adjustResize">
4239
</activity>
4340
<activity
4441
android:name=".hazardIdActivity"
4542
android:label="hazardIdActivity"
46-
android:theme="@style/AppTheme.NoActionBar"
4743
android:windowSoftInputMode="adjustResize">
4844
</activity>
4945
<activity
5046
android:name=".NonConformanceActivity"
5147
android:label="@string/title_activity_non_comformance"
52-
android:theme="@style/AppTheme.NoActionBar"
5348
android:windowSoftInputMode="adjustResize">
5449

5550
</activity>
5651
<activity
5752
android:name=".Take5Activity"
5853
android:label="@string/title_activity_take5"
59-
android:theme="@style/AppTheme.NoActionBar"
6054
android:windowSoftInputMode="adjustResize">
6155
</activity>
6256
<activity
6357
android:name=".SiteInstructionActivity"
6458
android:label="Site Instruction"
65-
android:theme="@style/AppTheme.NoActionBar"
6659
android:windowSoftInputMode="adjustResize"
6760
>
6861
</activity>
6962
<activity android:name=".IncidentReportActivity"
70-
android:label="Site Instruction"
71-
android:theme="@style/AppTheme.NoActionBar">
63+
android:label="Site Instruction">
7264

7365
</activity>
66+
<activity android:name=".Take5RiskElementActivity"
67+
android:screenOrientation="portrait"/>
68+
<activity android:name=".Take5ImageViewActivity"
69+
android:screenOrientation="portrait"/>
7470
</application>
7571

7672
</manifest>

‎app/src/main/assets/RobotoCondensed-Bold.ttf

-124 KB
Binary file not shown.

‎app/src/main/java/com/semfapp/adamdilger/semf/ImageFile.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ public Image getImage() {
6060
bmp.compress(Bitmap.CompressFormat.PNG, 100, stream);
6161
byte[] byteArray = stream.toByteArray();
6262

63-
6463
image = Image.getInstance(byteArray);
6564
// image = Image.getInstance(path);
6665
} catch (Exception e) {}
@@ -81,7 +80,7 @@ public Bitmap getBitmap() {
8180
exifInterface = new ExifInterface(filePath);
8281

8382
if (exifInterface.getAttributeInt(
84-
ExifInterface.TAG_ORIENTATION, 1) == ExifInterface.ORIENTATION_ROTATE_90){
83+
ExifInterface.TAG_ORIENTATION, 1) == ExifInterface.ORIENTATION_ROTATE_90) {
8584
rotation = 90;
8685
} else if (exifInterface.getAttributeInt(
8786
ExifInterface.TAG_ORIENTATION, 1) == ExifInterface.ORIENTATION_ROTATE_180) {
@@ -100,6 +99,7 @@ public Bitmap getBitmap() {
10099
BitmapFactory.decodeFile(filePath, options);
101100
float srcWidth = options.outWidth;
102101
float srcHeight = options.outHeight;
102+
103103
int inSampleSize = 1;
104104
if (srcHeight > destHeight || srcWidth > destWidth) {
105105
if (srcWidth > srcHeight) {
@@ -140,6 +140,7 @@ private Bitmap getBitmapForPdf(int width, int height) {
140140
inSampleSize = Math.round(srcWidth / destWidth);
141141
}
142142
}
143+
143144
options = new BitmapFactory.Options();
144145
options.inSampleSize = inSampleSize;
145146

‎app/src/main/java/com/semfapp/adamdilger/semf/PagerAdapterTemplate.java

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎app/src/main/java/com/semfapp/adamdilger/semf/Pdf.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,6 @@ private void createPDFNew(String filePath, String htmlString, @Nullable ArrayLis
176176
float imgWidth = document.getPageSize().getWidth() - 100;
177177
float imgHeight = document.getPageSize().getHeight() - 100;
178178

179-
180179
cursor.scaleToFit(new Rectangle(imgWidth, imgHeight));
181180

182181
document.add(cursor);

‎app/src/main/java/com/semfapp/adamdilger/semf/SiteInstructionF3.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ private void dispatchTakePictureIntent() {
107107
photoFile = data.createImageFile();
108108
imageFileCurrentPath = photoFile.getPath();
109109
} catch (Exception ex) {
110-
Toast.makeText(getActivity().getApplicationContext(), "Error: " + ex.toString(), Toast.LENGTH_LONG).show();
110+
Toast.makeText(getActivity(), "Error: " + ex.toString(), Toast.LENGTH_LONG).show();
111111
System.out.println(ex.toString());
112112
}
113113
// Continue only if the File was successfully created

0 commit comments

Comments
 (0)