Merge branch 'develop'

akvo · Sep 25, 2014 · e58038f · e58038f
2 parents a54227d + 6429678
commit e58038f
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 32 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,5 +1,13 @@
 Akvo FLOW app 
-Last update 19 September 2014
+Last update 25 September 2014
+
+#ver 2.0.3
+
+Features / Bugfixes
+-------------------
+* #167 - Empty forms cannot be submitted
+* #166 - Font colour blends with background
+* #160 - Revert all-caps policy in projects/survey titles
 
 #ver 2.0.2
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.akvo.flow"
     android:versionCode="1"
-    android:versionName="2.0.2" >
+    android:versionName="2.0.3" >
 
     <uses-sdk
         android:minSdkVersion="8"

diff --git a/app/src/main/java/org/akvo/flow/activity/SurveyActivity.java b/app/src/main/java/org/akvo/flow/activity/SurveyActivity.java
@@ -240,25 +240,13 @@ private void recordDuration(boolean start) {
 
     private void saveState() {
         if (!mReadOnly) {
-            for (QuestionResponse response : mQuestionResponses.values()) {
-                // Store the response if it contains a value. Otherwise, delete it
-                if (response.hasValue()) {
-                    response.setRespondentId(mSurveyInstanceId);
-                    mDatabase.createOrUpdateSurveyResponse(response);
-                } else if (response.getId() != null && response.getId() > 0) {
-                    // if we don't have a value BUT there is an ID, we need to
-                    // remove it since the user blanked out their response
-                    mDatabase.deleteResponse(mSurveyInstanceId, response.getQuestionId());
-                }
-            }
             mDatabase.updateSurveyStatus(mSurveyInstanceId, SurveyInstanceStatus.SAVED);
             mDatabase.updateRecordModifiedDate(mRecordId, System.currentTimeMillis());
 
             // Record meta-data, if applies
             if (mSurvey.getId().equals(mSurveyGroup.getRegisterSurveyId())) {
                 saveRecordMetaData();
             }
-
         }
     }
 
@@ -586,12 +574,16 @@ public void onClick(DialogInterface dialog, int id) {
         } else if (QuestionInteractionEvent.QUESTION_ANSWER_EVENT.equals(event.getEventType())) {
             String questionId = event.getSource().getQuestion().getId();
             QuestionResponse response = event.getSource().getResponse();
-            if (response != null) {
+
+            // Store the response if it contains a value. Otherwise, delete it
+            if (response != null && response.hasValue()) {
                 mQuestionResponses.put(questionId, response);
+                response.setRespondentId(mSurveyInstanceId);
+                mDatabase.createOrUpdateSurveyResponse(response);
             } else {
                 mQuestionResponses.remove(questionId);
+                mDatabase.deleteResponse(mSurveyInstanceId, questionId);
             }
-            // TODO: Should we save this Response to the DB straightaway?
         }
     }
 

diff --git a/app/src/main/java/org/akvo/flow/activity/SurveyGroupListActivity.java b/app/src/main/java/org/akvo/flow/activity/SurveyGroupListActivity.java
@@ -28,7 +28,6 @@
 import android.support.v4.content.Loader;
 import android.support.v4.widget.CursorAdapter;
 import android.support.v7.app.ActionBarActivity;
-import android.text.TextUtils;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.LayoutInflater;
@@ -279,11 +278,8 @@ public View newView(Context context, Cursor cursor, ViewGroup parent) {
         public void bindView(View view, Context context, Cursor cursor) {
             final SurveyGroup surveyGroup = SurveyDbAdapter.getSurveyGroup(cursor);
 
-            String name = !TextUtils.isEmpty(surveyGroup.getName()) ?
-                    surveyGroup.getName().toUpperCase() : null;
-
             TextView text1 = (TextView)view.findViewById(R.id.text1);
-            text1.setText(name);
+            text1.setText(surveyGroup.getName());
             text1.setTextColor(getResources().getColorStateList(mTextColor));
 
             // Alternate background

diff --git a/app/src/main/java/org/akvo/flow/ui/fragment/SurveyListFragment.java b/app/src/main/java/org/akvo/flow/ui/fragment/SurveyListFragment.java
@@ -26,7 +26,6 @@
 import android.support.v4.app.ListFragment;
 import android.support.v4.app.LoaderManager.LoaderCallbacks;
 import android.support.v4.content.Loader;
-import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -195,9 +194,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
             TextView lastSubmissionTitle = (TextView)listItem.findViewById(R.id.date_label);
             TextView lastSubmissionView = (TextView)listItem.findViewById(R.id.date);
 
-            String name = !TextUtils.isEmpty(surveyInfo.mName) ?
-                    surveyInfo.mName.toUpperCase() : null;
-            surveyNameView.setText(name);
+            surveyNameView.setText(surveyInfo.mName);
             surveyVersionView.setText("v" + surveyInfo.mVersion);
 
             final boolean enabled = isEnabled(surveyInfo.mId);

diff --git a/app/src/main/java/org/akvo/flow/ui/view/QuestionView.java b/app/src/main/java/org/akvo/flow/ui/view/QuestionView.java
@@ -188,7 +188,7 @@ private Spanned formText() {
                     } else {
                         isFirst = false;
                     }
-                    text.append("<font color='").append(sColors[i]).append("'>")
+                    text.append("<font color='").append(sColors[i % sColors.length]).append("'>")
                             .append(txt.getText()).append("</font>");
                 }
             }

diff --git a/app/src/main/java/org/akvo/flow/ui/view/SubmitTab.java b/app/src/main/java/org/akvo/flow/ui/view/SubmitTab.java
@@ -66,12 +66,15 @@ public void refresh(List<Question> invalidQuestions) {
         QuestionListAdapter adapter = new QuestionListAdapter(invalidQuestions);
         setAdapter(adapter);
 
-        if (invalidQuestions.isEmpty()) {
-            mHeaderView.setText(R.string.submittext);
-            mSubmitButton.setEnabled(true);
-        } else {
+        if (!invalidQuestions.isEmpty()) {
             mHeaderView.setText(R.string.error_responses);
             mSubmitButton.setEnabled(false);
+        } else if (mListener.getResponses().isEmpty()) {
+            mHeaderView.setText(R.string.error_empty_form);
+            mSubmitButton.setEnabled(false);
+        } else {
+            mHeaderView.setText(R.string.submittext);
+            mSubmitButton.setEnabled(true);
         }
     }
 

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
@@ -53,9 +53,9 @@
         <item>hi</item>
         <item>qu</item>
     </string-array>
-    <!-- must have enough colors for all languages -->
+    <!-- NOTE: Main color will suits the light theme. Must have enough colors for all languages -->
     <string-array name="colors">
-        <item>white</item>
+        <item>black</item>
         <item>red</item>
         <item>blue</item>
         <item>yellow</item>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -159,6 +159,7 @@
     <string name="reg_form_warning_title">Registration Survey</string>
     <string name="reg_form_warning_text">This Data Point already contains a response for this form. Any new responses will be used as the most recent values. Do you want to continue?</string>
     <string name="error_img_preview">Can\'t load image preview</string>
+    <string name="error_empty_form">Empty forms cannot be submitted. Please, add the corresponding responses first.</string>
     <!-- RecordList Activity -->
     <string name="create_data_point">CREATE NEW DATA POINT</string>
     <string name="stats_title">Project Stats</string>