Skip to content

Commit e539d8a

Browse files
committed
Update to version 2.1.
Made adjustments for Android O. Cleaned up code.
1 parent b5daed3 commit e539d8a

33 files changed

+934
-1079
lines changed

README.md

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,25 +43,27 @@ The following Python program can be used to test socket input. The
4343
program samples numbers from the standard Python pseudo random number
4444
generator and sends them to a network socket:
4545
```python
46+
from __future__ import print_function
4647
import random
4748
import socket
4849

49-
HOST = 'localhost' # host name of Android device
50-
PORT = 6869 # default port
50+
HOST = 'localhost' # Host name of Android device
51+
PORT = 6869 # Default port
5152
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
5253
s.connect((HOST, PORT))
53-
fs = s.makefile() # buffer for readline
54+
fs = s.makefile() # Buffer for readline
5455
for i in range(0, 700):
55-
# sample bits from generator
56+
# Sample bits from generator
5657
r = random.getrandbits(32)
57-
# conversion to signed 32 bit integer
58-
if (r & 0x80000000):
58+
# Conversion to signed 32 bit integer
59+
if r & 0x80000000:
5960
r = -0x100000000 + r
60-
s.sendall(str(r)+'\n') # send number string
61-
# read and print predictions
61+
# Send number string
62+
s.sendall(str(r) + '\n')
63+
# Read and print predictions
6264
for j in range(0, 9): # 8 predictions and newline
6365
l = fs.readline()
64-
print l,
66+
print(l, end='')
6567
s.close()
6668
```
6769
Start the app on the Android device and set the input spinner from
@@ -90,7 +92,7 @@ License
9092
-------
9193

9294
```text
93-
Copyright (C) 2015, 2016 Arno Onken
95+
Copyright (C) 2015-2017 Arno Onken
9496
9597
Licensed under the Apache License, Version 2.0 (the "License");
9698
you may not use this file except in compliance with the License.

app/app.iml

Lines changed: 12 additions & 35 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,86 +46,64 @@
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" />
6965
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
7066
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
7167
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
7268
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
7369
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
7570
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
7671
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7772
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7873
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
7974
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
8075
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
8176
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
82-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
8377
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8478
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
8579
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8680
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
8881
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/25.1.0/jars" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/25.1.0/jars" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-compat/25.1.0/jars" />
93-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-ui/25.1.0/jars" />
94-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-utils/25.1.0/jars" />
95-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-fragment/25.1.0/jars" />
96-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-media-compat/25.1.0/jars" />
97-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/25.1.0/jars" />
98-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/25.1.0/jars" />
9982
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
100-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
101-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
10283
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
103-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
104-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
105-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
10684
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
10785
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
10886
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
109-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
11087
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
111-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
11288
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
11389
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
11490
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
11591
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
11692
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/reports" />
11794
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
11895
</content>
119-
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
96+
<orderEntry type="jdk" jdkName="Android API 26 Platform" jdkType="Android SDK" />
12097
<orderEntry type="sourceFolder" forTests="false" />
121-
<orderEntry type="library" exported="" name="support-compat-25.1.0" level="project" />
122-
<orderEntry type="library" exported="" name="support-fragment-25.1.0" level="project" />
123-
<orderEntry type="library" exported="" name="animated-vector-drawable-25.1.0" level="project" />
124-
<orderEntry type="library" exported="" name="support-annotations-25.1.0" level="project" />
125-
<orderEntry type="library" exported="" name="support-v4-25.1.0" level="project" />
126-
<orderEntry type="library" exported="" name="support-core-ui-25.1.0" level="project" />
127-
<orderEntry type="library" exported="" name="support-media-compat-25.1.0" level="project" />
128-
<orderEntry type="library" exported="" name="support-vector-drawable-25.1.0" level="project" />
129-
<orderEntry type="library" exported="" name="appcompat-v7-25.1.0" level="project" />
130-
<orderEntry type="library" exported="" name="support-core-utils-25.1.0" level="project" />
98+
<orderEntry type="library" exported="" name="support-core-ui-26.0.0" level="project" />
99+
<orderEntry type="library" exported="" name="support-fragment-26.0.0" level="project" />
100+
<orderEntry type="library" exported="" name="animated-vector-drawable-26.0.0" level="project" />
101+
<orderEntry type="library" exported="" name="support-annotations-26.0.0" level="project" />
102+
<orderEntry type="library" exported="" name="appcompat-v7-26.0.0" level="project" />
103+
<orderEntry type="library" exported="" name="support-media-compat-26.0.0" level="project" />
104+
<orderEntry type="library" exported="" name="support-compat-26.0.0" level="project" />
105+
<orderEntry type="library" exported="" name="support-vector-drawable-26.0.0" level="project" />
106+
<orderEntry type="library" exported="" name="support-core-utils-26.0.0" level="project" />
107+
<orderEntry type="library" exported="" name="support-v4-26.0.0" level="project" />
131108
</component>
132109
</module>

app/build.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2015, 2016 Arno Onken
2+
* Copyright (C) 2015-2017 Arno Onken
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -16,13 +16,13 @@
1616
apply plugin: 'com.android.application'
1717

1818
android {
19-
compileSdkVersion 25
20-
buildToolsVersion "25.0.2"
19+
compileSdkVersion 26
20+
buildToolsVersion "26.0.1"
2121

2222
defaultConfig {
2323
applicationId "org.asnelt.derandom"
24-
minSdkVersion 9
25-
targetSdkVersion 25
24+
minSdkVersion 14
25+
targetSdkVersion 26
2626
return void
2727
}
2828

@@ -37,6 +37,6 @@ android {
3737
}
3838

3939
dependencies {
40-
compile 'com.android.support:appcompat-v7:25.1.0'
41-
compile 'com.android.support:support-v4:25.1.0'
42-
}
40+
compile 'com.android.support:appcompat-v7:26.0.0'
41+
compile 'com.android.support:support-v4:26.0.0'
42+
}

app/src/main/AndroidManifest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!--
3-
Copyright (C) 2015, 2016 Arno Onken
3+
Copyright (C) 2015-2017 Arno Onken
44
55
Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@ limitations under the License.
1717
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
1818
xmlns:tools="http://schemas.android.com/tools"
1919
package="org.asnelt.derandom"
20-
android:versionCode="10"
21-
android:versionName="2.0" >
20+
android:versionCode="11"
21+
android:versionName="2.1" >
2222

2323
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
2424
<uses-permission android:name="android.permission.INTERNET" />

app/src/main/java/org/asnelt/derandom/DisplayParametersActivity.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2015, 2016 Arno Onken
2+
* Copyright (C) 2015-2017 Arno Onken
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -59,8 +59,7 @@ protected void onCreate(Bundle savedInstanceState) {
5959
parameters = new long[0];
6060
}
6161

62-
ScrollView scrollViewParameters = (ScrollView) view.findViewById(
63-
R.id.scroll_view_parameters);
62+
ScrollView scrollViewParameters = view.findViewById(R.id.scroll_view_parameters);
6463
// Add layout
6564
LinearLayout layoutParameters = new LinearLayout(this);
6665
layoutParameters.setOrientation(LinearLayout.VERTICAL);

0 commit comments

Comments
 (0)