Skip to content

Commit 7d26322

Browse files
committed
Release Version 2.03
- Added Help screen - Added Wurm Logbook to display drawing history - Updated app icon - Updated notification icon - Updated Navigation Drawer profile icon - Fixed an issue on some phones where pressing the Settings back button does not correctly go back to the drawing screen - Disabled controls when sending images
1 parent 37c717a commit 7d26322

File tree

11 files changed

+220
-191
lines changed

11 files changed

+220
-191
lines changed

README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,15 @@ Android drawing application for annotating the backbone of worms.
88

99
## Releases
1010

11+
### 2.03 (2018-05-09)
12+
- Added Help screen
13+
- Added Wurm Logbook to display drawing history
14+
- Updated app icon
15+
- Updated notification icon
16+
- Updated Navigation Drawer profile icon
17+
- Fixed an issue on some phones where pressing the Settings back button does not correctly go back to the drawing screen
18+
- Disabled controls when sending images
19+
1120
### 1.09 (2018-4-28)
1221
- Updated Achievements scoring
1322
- Updated LeaderBoard submissions
0 Bytes
Binary file not shown.

app/.idea/workspace.xml

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

app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ android {
99
applicationId "com.caden.drawing.wurmpaint"
1010
minSdkVersion 21
1111
targetSdkVersion 26
12-
versionCode 2
13-
versionName "2.0"
12+
versionCode 4
13+
versionName "2.02"
1414
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1515
}
1616
buildTypes {
1717
release {
18-
minifyEnabled true
18+
minifyEnabled false
1919
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
2020
}
2121
}

app/release/output.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":2},"path":"app-release.apk","properties":{"packageId":"com.caden.drawing.wurmpaint","split":"","minSdkVersion":"21"}}]
1+
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":4},"path":"app-release.apk","properties":{"packageId":"com.caden.drawing.wurmpaint","split":"","minSdkVersion":"21"}}]

app/src/main/java/com/caden/drawing/wurmpaint/DrawingActivity.java

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,9 @@ public class DrawingActivity extends AppCompatActivity
9292
private float mLastX;
9393
private float mLastY;
9494

95-
Button btnMarkBad;
95+
Button btnReport;
96+
Button btnNextRand;
97+
Button btnClear;
9698
Button btnColor;
9799

98100
/* FireBase */
@@ -169,7 +171,9 @@ protected void onCreate(Bundle savedInstanceState) {
169171

170172
/* Get the Draw Model Object */
171173
drawModel = new DrawModel(PIXEL_WIDTH, PIXEL_HEIGHT);
172-
btnMarkBad = findViewById(R.id.btn_mark_bad);
174+
btnReport = findViewById(R.id.btn_mark_bad);
175+
btnNextRand = findViewById(R.id.btn_next);
176+
btnClear = findViewById(R.id.btn_clear);
173177
btnColor = findViewById(R.id.btn_color);
174178
clDrawMain = findViewById(R.id.cl_draw_main);
175179
navView = findViewById(R.id.nav_view);
@@ -512,6 +516,10 @@ public void sendImage(View v) {
512516
constraintSet.constrainHeight(R.id.cv_drawview, 0);
513517
constraintSet.constrainHeight(R.id.drawing_ll, dvHeight / 2);
514518
constraintSet.applyTo(clDrawMain);
519+
btnReport.setEnabled(false);
520+
btnNextRand.setEnabled(false);
521+
btnClear.setEnabled(false);
522+
btnColor.setEnabled(false);
515523

516524
Bitmap bmp = drawView.getBitmapData();
517525
ByteArrayOutputStream baOS = new ByteArrayOutputStream();
@@ -542,6 +550,10 @@ public void sendImage(View v) {
542550
constraintSet.constrainHeight(R.id.cv_drawview, dvHeight);
543551
constraintSet.constrainHeight(R.id.drawing_ll, 0);
544552
constraintSet.applyTo(clDrawMain);
553+
btnReport.setEnabled(true);
554+
btnNextRand.setEnabled(true);
555+
btnClear.setEnabled(true);
556+
btnColor.setEnabled(true);
545557
/* Load the next drawing */
546558
nextImage(v);
547559
});

app/src/main/res/values/strings.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,16 @@
8282
<string name="change_log_text" translatable="false">
8383
<![CDATA[
8484
<h1>Changelog</h1>
85+
<h3>2.03 (2018-05-09)</h3>
86+
<span>
87+
- Added Help screen <br />
88+
- Added Wurm Logbook to display drawing history <br />
89+
- Updated app icon <br />
90+
- Updated notification icon <br />
91+
- Updated Navigation Drawer profile icon <br />
92+
- Fixed an issue on some phones where pressing the Settings back button does not correctly go back to the drawing screen<br />
93+
- Disabled controls when sending images <br />
94+
</span>
8595
<h3>1.09 (2018-4-28)</h3>
8696
<span>
8797
- Updated Achievements scoring <br />

screens/scr_1.jpg

-127 KB
Binary file not shown.

screens/scr_2.jpg

-123 KB
Binary file not shown.

screens/scr_3.jpg

-140 KB
Binary file not shown.

0 commit comments

Comments
 (0)