Skip to content

Commit

Permalink
refs #73,#40 Get rid of the "already started" message. Shouldn't happen
Browse files Browse the repository at this point in the history
on a new session when you start from preloaded question.  Also add
version #
  • Loading branch information
truedat101 committed Dec 11, 2013
1 parent db2420d commit 525c378
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
4 changes: 2 additions & 2 deletions AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
package="org.smilec.smile"
android:versionCode="5"
android:versionName="0.2.11">
android:versionCode="6"
android:versionName="0.3.1">

<uses-sdk android:minSdkVersion="7" />

Expand Down
6 changes: 3 additions & 3 deletions res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@
<string name="top_scores">TOP SCORER</string>

<string name="about">About</string>
<string name="about_text">SMILE Teacher SMILE Teacher Desktop App 0.2.7: The activity management application for teachers,
<string name="about_text">SMILE Teacher App 0.3.1: The activity management application for teachers,
called the SMILE Teacher, serves to manage and
save data from the activity via an ad-hoc network. It is a
Graphic User Interface-based application that can be
launched on an Android tablet in conjuction with a the Server
running on a PlugComputer. The application
allows the teacher to control and monitor all of the students’
activity in real time. It also allows the teacher to save the
allows the teacher to facilitate inquiry-based learning in a collaborative environment
It also allows the teacher to save the
data from a given learning activity for later access.</string>
<string name="ok">OK</string>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
import android.widget.ListView;
import android.widget.Spinner;
import android.widget.TextView;
import android.util.Log;

public class UsePreparedQuestionsActivity extends ListActivity {

Expand Down Expand Up @@ -164,7 +165,8 @@ private class LoadButtonListener implements OnClickListener {
@Override
public void onClick(View v) {
if (status != null) {
if (!status.equals("")) {
Log.d("SMILE Teacher", "Status = " + status);
if (!status.equals("") && !status.equals("START_MAKE")) {
AlertDialog.Builder builder = new AlertDialog.Builder(
UsePreparedQuestionsActivity.this);
builder.setMessage(R.string.game_running).setCancelable(false)
Expand Down

0 comments on commit 525c378

Please sign in to comment.