From e350e89174aa74a6d46fe85dc8da778c811aa7e2 Mon Sep 17 00:00:00 2001 From: chrqls Date: Thu, 14 Nov 2013 14:45:03 +0100 Subject: [PATCH 1/2] [#36] Adding a teacherName/sessionTitle/groupName between login screen and 'start making questions' button --- .classpath | 25 ++- .gitignore | 2 + AndroidManifest.xml | 1 + project.properties | 2 +- res/layout-large-land/session_values.xml | 73 +++++++ res/layout-xlarge-land/session_values.xml | 97 +++++++++ res/layout/session_values.xml | 96 +++++++++ res/values/strings.xml | 7 + .../smile/bu/SmilePlugServerManager.java | 18 ++ .../smile/ui/ChooseActivityFlowDialog.java | 2 +- .../org/smilec/smile/ui/LoginActivity.java | 4 +- .../smile/ui/SessionValuesActivity.java | 194 ++++++++++++++++++ .../java/org/smilec/smile/util/HttpUtil.java | 1 + .../org/smilec/smile/util/SmilePlugUtil.java | 1 + 14 files changed, 506 insertions(+), 17 deletions(-) create mode 100644 res/layout-large-land/session_values.xml create mode 100644 res/layout-xlarge-land/session_values.xml create mode 100644 res/layout/session_values.xml create mode 100644 src/main/java/org/smilec/smile/ui/SessionValuesActivity.java diff --git a/.classpath b/.classpath index e2f51ca..41426a7 100644 --- a/.classpath +++ b/.classpath @@ -1,13 +1,12 @@ - - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/.gitignore b/.gitignore index a017afb..6718d14 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ /smileplug-adm-test/target /gen /bin + +lint.xml diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f6cad67..48ea5d0 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -26,6 +26,7 @@ + diff --git a/project.properties b/project.properties index 0840b4a..ce39f2d 100644 --- a/project.properties +++ b/project.properties @@ -11,4 +11,4 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-15 +target=android-18 diff --git a/res/layout-large-land/session_values.xml b/res/layout-large-land/session_values.xml new file mode 100644 index 0000000..60e982e --- /dev/null +++ b/res/layout-large-land/session_values.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + +