Skip to content

Commit 16427e5

Browse files
author
River
committed
Update example to android studio
1 parent 844e795 commit 16427e5

33 files changed

+333
-100
lines changed

Diff for: .classpath

-8
This file was deleted.

Diff for: .gradle/2.8/taskArtifacts/cache.properties

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#Tue Dec 29 14:57:09 CST 2015

Diff for: .gradle/2.8/taskArtifacts/cache.properties.lock

17 Bytes
Binary file not shown.

Diff for: .gradle/2.8/taskArtifacts/fileHashes.bin

22 KB
Binary file not shown.

Diff for: .gradle/2.8/taskArtifacts/fileSnapshots.bin

77 KB
Binary file not shown.

Diff for: .gradle/2.8/taskArtifacts/outputFileStates.bin

19.3 KB
Binary file not shown.

Diff for: .gradle/2.8/taskArtifacts/taskArtifacts.bin

54.1 KB
Binary file not shown.

Diff for: .project

-33
This file was deleted.

Diff for: README.md

-9
This file was deleted.

Diff for: app/build.gradle

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
apply plugin: 'com.android.application'
2+
3+
android {
4+
compileSdkVersion 17
5+
buildToolsVersion "23.0.1"
6+
7+
defaultConfig {
8+
applicationId "org.qpython.sample"
9+
minSdkVersion 8
10+
targetSdkVersion 16
11+
}
12+
13+
buildTypes {
14+
release {
15+
minifyEnabled false
16+
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
17+
}
18+
}
19+
}
20+
21+
dependencies {
22+
compile 'com.android.support:support-v4:18.0.0'
23+
}
File renamed without changes.

Diff for: src/org/qpython/sample/MainActivity.java renamed to app/src/main/java/org/qpython/sample/MainActivity.java

+17-3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import android.util.Log;
1212
import android.view.Menu;
1313
import android.view.View;
14+
import android.widget.EditText;
1415
import android.widget.Toast;
1516

1617
public class MainActivity extends Activity {
@@ -19,6 +20,17 @@ public class MainActivity extends Activity {
1920
protected void onCreate(Bundle savedInstanceState) {
2021
super.onCreate(savedInstanceState);
2122
setContentView(R.layout.activity_main);
23+
EditText code = (EditText)findViewById(R.id.edit_text);
24+
code.setText("#qpy:console\n" +
25+
"try:\n" +
26+
" import androidhelper\n" +
27+
"\n" +
28+
" droid = androidhelper.Android()\n" +
29+
" line = droid.dialogGetInput()\n" +
30+
" s = 'Hello %s' % line.result\n" +
31+
" droid.makeToast(s)\n" +
32+
"except:\n" +
33+
" print(\"Hello, Please update to newest QPython version from (http://play.qpython.com/qrcode-python.html) to use this feature\")\n");
2234
}
2335

2436
@Override
@@ -56,7 +68,7 @@ public void onQPyExec(View v) {
5668

5769
Intent intent = new Intent();
5870
intent.setClassName(extPlgPlusName, extPlgPlusName+".MPyApi");
59-
intent.setAction(extPlgPlusName+".action.MPyApi");
71+
intent.setAction(extPlgPlusName + ".action.MPyApi");
6072

6173
Bundle mBundle = new Bundle();
6274
mBundle.putString("app", "myappid");
@@ -66,8 +78,10 @@ public void onQPyExec(View v) {
6678

6779
/*
6880
* The String Python code, you can put your py file in res or raw or intenet, so that you can get it the same way, which can make it scalable
69-
*/
70-
mBundle.putString("pycode", "print 'Hello world'");
81+
*/
82+
EditText codeTxt = (EditText)findViewById(R.id.edit_text);
83+
String code = codeTxt.getText().toString();
84+
mBundle.putString("pycode", code);
7185

7286
intent.putExtras(mBundle);
7387

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Diff for: res/layout/activity_main.xml renamed to app/src/main/res/layout/activity_main.xml

+19-5
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,40 @@
77
<LinearLayout
88
android:layout_width="fill_parent"
99
android:layout_height="fill_parent"
10-
android:orientation="vertical">
10+
android:orientation="vertical"
11+
android:weightSum="1">
1112

1213
<TextView
1314
android:padding="20dip"
1415
android:layout_width="wrap_content"
1516
android:layout_height="wrap_content"
1617
android:layout_centerHorizontal="true"
1718
android:layout_centerVertical="true"
19+
android:textColor="#999999"
1820
android:text="@string/hello_world" />
1921

2022

21-
<Button
23+
24+
25+
<EditText
26+
android:layout_width="match_parent"
27+
android:layout_height="wrap_content"
28+
android:inputType="textMultiLine"
29+
android:ems="10"
30+
android:id="@+id/edit_text"
31+
android:textColor="#313131"
32+
android:layout_weight="0.32"
33+
android:text="@string/sample_code" />
34+
35+
<Button
2236
android:id="@+id/button1"
23-
android:layout_width="wrap_content"
37+
android:layout_width="290dp"
2438
android:layout_height="wrap_content"
2539
android:layout_centerHorizontal="true"
2640
android:layout_centerVertical="true"
2741
android:onClick="onQPyExec"
28-
android:text="Click me" />
29-
42+
android:text="Run"
43+
android:layout_gravity="center_horizontal" />
3044
</LinearLayout>
3145

3246
</RelativeLayout>
File renamed without changes.
File renamed without changes.
File renamed without changes.

Diff for: app/src/main/res/values/strings.xml

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
4+
<string name="app_name">Android App With QPython API</string>
5+
<string name="hello_world">Please install the QPython and Click the button to see the sample to get middle result from QPython !</string>
6+
<string name="menu_settings">Settings</string>
7+
<string name="sample_code" formatted="false">print \"Hello\"</string>
8+
9+
</resources>
File renamed without changes.

Diff for: gradle/wrapper/gradle-wrapper.jar

52.4 KB
Binary file not shown.

Diff for: gradle/wrapper/gradle-wrapper.properties

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#Wed Oct 21 11:34:03 PDT 2015
2+
distributionBase=GRADLE_USER_HOME
3+
distributionPath=wrapper/dists
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip

Diff for: gradlew

+160
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,160 @@
1+
#!/usr/bin/env bash
2+
3+
##############################################################################
4+
##
5+
## Gradle start up script for UN*X
6+
##
7+
##############################################################################
8+
9+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
10+
DEFAULT_JVM_OPTS=""
11+
12+
APP_NAME="Gradle"
13+
APP_BASE_NAME=`basename "$0"`
14+
15+
# Use the maximum available, or set MAX_FD != -1 to use that value.
16+
MAX_FD="maximum"
17+
18+
warn ( ) {
19+
echo "$*"
20+
}
21+
22+
die ( ) {
23+
echo
24+
echo "$*"
25+
echo
26+
exit 1
27+
}
28+
29+
# OS specific support (must be 'true' or 'false').
30+
cygwin=false
31+
msys=false
32+
darwin=false
33+
case "`uname`" in
34+
CYGWIN* )
35+
cygwin=true
36+
;;
37+
Darwin* )
38+
darwin=true
39+
;;
40+
MINGW* )
41+
msys=true
42+
;;
43+
esac
44+
45+
# Attempt to set APP_HOME
46+
# Resolve links: $0 may be a link
47+
PRG="$0"
48+
# Need this for relative symlinks.
49+
while [ -h "$PRG" ] ; do
50+
ls=`ls -ld "$PRG"`
51+
link=`expr "$ls" : '.*-> \(.*\)$'`
52+
if expr "$link" : '/.*' > /dev/null; then
53+
PRG="$link"
54+
else
55+
PRG=`dirname "$PRG"`"/$link"
56+
fi
57+
done
58+
SAVED="`pwd`"
59+
cd "`dirname \"$PRG\"`/" >/dev/null
60+
APP_HOME="`pwd -P`"
61+
cd "$SAVED" >/dev/null
62+
63+
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
64+
65+
# Determine the Java command to use to start the JVM.
66+
if [ -n "$JAVA_HOME" ] ; then
67+
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
68+
# IBM's JDK on AIX uses strange locations for the executables
69+
JAVACMD="$JAVA_HOME/jre/sh/java"
70+
else
71+
JAVACMD="$JAVA_HOME/bin/java"
72+
fi
73+
if [ ! -x "$JAVACMD" ] ; then
74+
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
75+
76+
Please set the JAVA_HOME variable in your environment to match the
77+
location of your Java installation."
78+
fi
79+
else
80+
JAVACMD="java"
81+
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
82+
83+
Please set the JAVA_HOME variable in your environment to match the
84+
location of your Java installation."
85+
fi
86+
87+
# Increase the maximum file descriptors if we can.
88+
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
89+
MAX_FD_LIMIT=`ulimit -H -n`
90+
if [ $? -eq 0 ] ; then
91+
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
92+
MAX_FD="$MAX_FD_LIMIT"
93+
fi
94+
ulimit -n $MAX_FD
95+
if [ $? -ne 0 ] ; then
96+
warn "Could not set maximum file descriptor limit: $MAX_FD"
97+
fi
98+
else
99+
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
100+
fi
101+
fi
102+
103+
# For Darwin, add options to specify how the application appears in the dock
104+
if $darwin; then
105+
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
106+
fi
107+
108+
# For Cygwin, switch paths to Windows format before running java
109+
if $cygwin ; then
110+
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
111+
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
112+
JAVACMD=`cygpath --unix "$JAVACMD"`
113+
114+
# We build the pattern for arguments to be converted via cygpath
115+
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
116+
SEP=""
117+
for dir in $ROOTDIRSRAW ; do
118+
ROOTDIRS="$ROOTDIRS$SEP$dir"
119+
SEP="|"
120+
done
121+
OURCYGPATTERN="(^($ROOTDIRS))"
122+
# Add a user-defined pattern to the cygpath arguments
123+
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
124+
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
125+
fi
126+
# Now convert the arguments - kludge to limit ourselves to /bin/sh
127+
i=0
128+
for arg in "$@" ; do
129+
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
130+
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
131+
132+
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
133+
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
134+
else
135+
eval `echo args$i`="\"$arg\""
136+
fi
137+
i=$((i+1))
138+
done
139+
case $i in
140+
(0) set -- ;;
141+
(1) set -- "$args0" ;;
142+
(2) set -- "$args0" "$args1" ;;
143+
(3) set -- "$args0" "$args1" "$args2" ;;
144+
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
145+
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
146+
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
147+
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
148+
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
149+
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
150+
esac
151+
fi
152+
153+
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
154+
function splitJvmOpts() {
155+
JVM_OPTS=("$@")
156+
}
157+
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
158+
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
159+
160+
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

0 commit comments

Comments
 (0)