refs #26 Merge tag '0.9.9b1-jamsj'

* tag '0.9.9b1-jamsj': (95 commits)
  refs SMILEConsortium#106 Bump version string for testing.
  [#4] Adding comments and removing useless ids
  refs SMILEConsortium#105 Remove jamsj string
  refs SMILEConsortium#105 add icon for jamsj.
  refs SMILEConsortium#67 Add proper string and bump version for release.
  [#4] 'Preview iqsets' button is coming... yay! \o/
  [#4] Date format modified in 'use prepared questions' screen
  [#4] Just adding a simple feature to see the number of preloaded questions per IQSet.
  [SMILEConsortium#101] Restart button will alert the teacher if server is down
  [SMILEConsortium#95] Cleaning, removing comments, merging duplicate constants in the same file: Constants.java
  refs SMILEConsortium#91,SMILEConsortium#95 Fix for deletion handling where we were not checking for any error conditions.  This should be revisited in the future to beef up JSON handling (I don't parse the JSON from the message body).  For now we just toast the thing if we succeed or fail.  Let the model update things.
  refs SMILEConsortium#92,SMILEConsortium#93 Undo previous hack, instead, let's let the model update itself via the BoardManager, and fix the server where the problem really exists.  The server only deleted the question from the model where the students receive their questions from, but not from the model where the teacher app gets its data.  Confusing, yes, but we should have been able to debug this by just looking through the teacher and server.
  [SMILEConsortium#92] Fixing little bug when no question in session
  [SMILEConsortium#92] Fixing bug if restarting new session + cleaning + adding comments
  [SMILEConsortium#92] Questions can appear now, even if we crash the teacher app
  [SMILEConsortium#75] Return to teacher data when restart a session
  [#14] Removing 'Highest Rating' + Reparing '% correct'
  [SMILEConsortium#60] Deleting questions only during START_MAKE
  [SMILEConsortium#60] We can delete last question now
  [SMILEConsortium#60] We can 'delete' the questions from teacher app but crap solution...
  ...

.classpath

@@ -1,10 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry exported="true" kind="lib" path="libs/activation-1.1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/javax.mail-1.5.0.jar"/>
+	<classpathentry kind="src" path="src/test/java"/>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>

.gitignore

@@ -7,3 +7,6 @@
 /smileplug-adm-test/target
 /gen
 /bin
+
+lint.xml
+smiledb-test/

.project

@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>smile_teacher_android</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>smile_teacher_android</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

AndroidManifest.xml

@@ -2,13 +2,13 @@
 <manifest
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	package="org.smilec.smile"
-	android:versionCode="1"
-	android:versionName="0.2.7">
+	android:versionCode="9"
+	android:versionName="0.9.9b1">
 
 	<uses-sdk android:minSdkVersion="7" />
 
 	<application
-		android:icon="@drawable/icon"
+		android:icon="@drawable/icon_jamsj"
 		android:label="@string/app_name"
 		android:theme="@style/Theme.FullScreen"
 		android:debuggable="true">
@@ -18,14 +18,15 @@
 				  android:label="@string/app_name"
 				  android:theme="@style/Theme.Transparent"
 				  android:screenOrientation="landscape"
-				  android:windowSoftInputMode="stateHidden"
+				  android:windowSoftInputMode="adjustResize"
 				  >
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
 				<category android:name="android.intent.category.LAUNCHER" />
 			</intent-filter>
 		</activity>
 
+		<activity android:name=".ui.SessionValuesActivity" android:screenOrientation="landscape"/>
 		<activity android:name=".ui.GeneralActivity" android:screenOrientation="landscape"/>
 		<activity android:name=".ui.ChooseActivityFlowDialog" android:screenOrientation="landscape" android:theme="@style/Dialog"/>
 		<activity android:name=".ui.UsePreparedQuestionsActivity" android:screenOrientation="landscape" android:theme="@style/Theme.Transparent"/>

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

res/drawable/btn_back.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	 <item android:drawable="@drawable/btn_back_pressed"
+          android:state_pressed="true" />
+    <item android:drawable="@drawable/btn_back_normal" />
+</selector>

res/drawable/btn_trash.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	 <item android:drawable="@drawable/btn_trash_pressed"
+          android:state_pressed="true" />
+    <item android:drawable="@drawable/btn_trash_normal" />
+</selector>

res/drawable/scrollbar_vertical_thumb.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient android:startColor="#3333FF" android:endColor="#8080FF"
+            android:angle="0"/>
+    <corners android:radius="6dp" />
+</shape>

res/drawable/scrollbar_vertical_track.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient android:startColor="#505050" android:endColor="#C0C0C0"
+            android:angle="0"/>
+ </shape>

res/layout-large-land/activity_flow.xml

@@ -27,23 +27,23 @@
 
 	<Button
   		android:id="@+id/bt_start"
-  		android:layout_width="100dip"
-  		android:layout_height="80sp"
+  		android:layout_width="200dip"
+  		android:layout_height="160sp"
   		android:text="@string/start_making"
-  		android:textSize="12sp"
-  		android:layout_marginLeft="100sp"
+  		android:textSize="20sp"
+  		android:layout_marginRight="90sp"
   		android:layout_centerVertical="true"
-  		android:layout_alignParentLeft="true"/>
+  		android:layout_toLeftOf="@+id/view_separator_middle"/>
 
 	<Button
   		android:id="@+id/bt_use_prerared"
-  		android:layout_width="100sp"
-  		android:layout_height="80sp"
+  		android:layout_width="200sp"
+  		android:layout_height="160sp"
   		android:text="@string/use_prepared"
-  		android:textSize="12sp"
-  		android:layout_marginRight="100sp"
-		android:layout_centerVertical="true"
-		android:layout_alignParentRight="true"/>
+  		android:textSize="20sp"
+  		android:layout_marginLeft="90sp"
+  		android:layout_centerVertical="true"
+  		android:layout_toRightOf="@+id/view_separator_middle"/>
 
 	<View
 		android:id="@+id/view_separator2"
@@ -54,6 +54,16 @@
 		android:layout_marginRight="5dip"
 		android:layout_marginBottom="20dip"
 		android:layout_alignParentBottom="true"/>
+
+	<Button
+	  	android:id="@+id/bt_exit"
+	  	android:layout_width="100sp"
+		android:layout_height="wrap_content"
+		android:text="@string/btn_exit"
+		android:textSize="18sp" 
+		android:layout_marginBottom="10dip"
+		android:layout_above="@+id/view_separator2"
+		android:layout_centerHorizontal="true"/>
 
 	<View
 		android:id="@+id/view_separator_middle"
@@ -63,6 +73,6 @@
 		android:layout_margin="20dip"
 		android:layout_centerInParent="true"
 		android:layout_below="@+id/view_separator"
-		android:layout_above="@+id/view_separator2"/>
+		android:layout_above="@+id/bt_exit"/>
 
 </RelativeLayout>

res/layout-large-land/feedback.xml

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+  	android:layout_width="fill_parent"
+  	android:layout_height="fill_parent"
+  	android:layout_gravity="center"
+  	android:background="@drawable/rounded_border"
+  	android:layout_margin="50dip">
+
+  	<TextView
+  	    android:id="@+id/tv_title"
+  	    android:layout_width="wrap_content"
+  	    android:layout_height="wrap_content"
+  	    android:layout_centerHorizontal="true"
+  	    android:layout_marginTop="10dip"
+  	    android:paddingBottom="35dp"
+  	    android:text="@string/send_report"
+  	    android:textColor="@color/black"
+  	    android:textSize="12sp" />
+
+	<View
+		android:id="@+id/view_separator"
+		android:layout_width="fill_parent"
+		android:layout_height="1dip"
+		android:background="@color/white"
+		android:layout_margin="5dip"
+		android:layout_below="@id/tv_title"/>
+
+	<EditText
+	    android:id="@+id/et_message"
+	    android:layout_width="450sp"
+	    android:layout_height="fill_parent"
+	    android:layout_below="@+id/tv_name_file"
+	    android:layout_centerHorizontal="true"
+	    android:layout_marginTop="20dip"
+	    android:layout_marginBottom="100dip"
+	    android:height="150dp"
+	    android:inputType="text"
+	    android:maxLines="6"
+	    android:singleLine="true"
+	    android:textSize="12sp"
+	    android:gravity="top" />
+
+	<View
+		android:id="@+id/view_separator2"
+		android:layout_width="fill_parent"
+		android:layout_height="1dip"
+		android:background="@color/white"
+		android:layout_marginLeft="5dip"
+		android:layout_marginRight="5dip"
+		android:layout_marginBottom="20dip"
+		android:layout_alignParentBottom="true"/>
+
+	<TextView
+	    android:id="@+id/tv_name_file"
+	    android:layout_width="wrap_content"
+	    android:layout_height="wrap_content"
+	    android:layout_below="@+id/tv_title"
+	    android:layout_centerHorizontal="true"
+	    android:layout_margin="10dip"
+	    android:layout_marginTop="41dp"
+	    android:text="@string/send_report_body"
+	    android:textColor="@color/black"
+
+	    android:textSize="12sp" />
+
+	<ImageButton
+	    android:id="@+id/bt_close"
+	    android:layout_width="wrap_content"
+	    android:layout_height="wrap_content"
+	    android:layout_alignParentRight="true"
+	    android:layout_alignTop="@+id/tv_title"
+	    android:layout_marginRight="35dp"
+	    android:background="@drawable/btn_close"
+	    android:contentDescription="@string/close_dialog" />
+
+	<Button
+	    android:id="@+id/bt_send_report"
+	    android:layout_width="100sp"
+	    android:layout_height="wrap_content"
+	    android:layout_alignParentBottom="true"
+	    android:layout_centerHorizontal="true"
+	    android:layout_marginBottom="26dp"
+	    android:enabled="false"
+	    android:text="@string/send_report_btn"
+	    android:textSize="12sp" />
+
+</RelativeLayout>

res/layout-large-land/iqset_details.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+    <RelativeLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/container"
+  	android:layout_width="fill_parent"
+  	android:layout_height="fill_parent"
+  	android:background="@drawable/rounded_border"
+  	android:layout_gravity="center"
+  	android:layout_marginLeft="200dip"
+  	android:layout_marginRight="200dip"
+  	android:layout_marginTop="100dip"
+  	android:layout_marginBottom="100dip">
+
+    <ImageButton 
+        android:id="@+id/bt_close"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/btn_close"
+        android:contentDescription="@string/close_dialog"
+        android:layout_alignParentRight="true"
+        android:layout_marginRight="10dp"
+        android:layout_marginTop="10dp" />
+
+    <TextView
+  	  	android:id="@+id/tv_title"
+  	  	android:layout_width="wrap_content"
+   		android:layout_height="wrap_content"
+   		android:text="@string/iqset_uppercase"
+      	android:textStyle="bold"
+      	android:textSize="16sp"
+      	android:textColor="@color/black"
+      	android:layout_marginTop="30dip"
+      	android:layout_centerHorizontal="true" />
+
+    <View
+		android:id="@+id/view_separator"
+		android:layout_width="fill_parent"
+		android:layout_height="1dip"
+		android:layout_marginLeft="5dip"
+		android:layout_marginRight="5dip"
+		android:background="@color/gray"
+		android:layout_below="@+id/bt_close"
+		android:layout_margin="5dip"/>
+
+    <ListView
+	    android:id="@+id/lv_questions_preview"
+	    android:layout_width="fill_parent"
+	    android:layout_height="fill_parent"
+	    android:layout_alignParentLeft="true"
+	    android:layout_below="@+id/view_separator"
+	    android:layout_marginBottom="20dip"
+	    android:layout_marginLeft="20dip"
+	    android:layout_marginRight="20dip"
+	    android:layout_marginTop="10dip"
+	    android:choiceMode="singleChoice"
+	    android:divider="@android:color/transparent"
+	    android:dividerHeight="10.0sp" />
+
+
+</RelativeLayout>