Merge pull request #32 from dividiti/issue-30

Some minor fixes for the new version #30

Author: gfursin

app/src/main/java/openscience/crowdsource/video/experiments/MainActivity.java

@@ -38,6 +38,8 @@
 import android.provider.MediaStore;
 import android.support.annotation.NonNull;
 import android.text.Html;
+import android.text.SpannableString;
+import android.text.style.UnderlineSpan;
 import android.util.Base64;
 import android.util.Log;
 import android.view.SurfaceHolder;
@@ -92,6 +94,7 @@ public class MainActivity extends Activity implements GLSurfaceView.Renderer {
     private static final int REQUEST_IMAGE_CAPTURE = 100;
     private static final int REQUEST_IMAGE_SELECT = 200;
     public static final int MEDIA_TYPE_IMAGE = 1;
+    public static final String ACKNOWLEDGE_YOUR_CONTRIBUTIONS = "acknowledge your contributions!";
 
 
     String welcome = "This application let you participate in experiment crowdsourcing " +
@@ -569,8 +572,15 @@ private void loadCachedEmail() {
         email = read_one_string_file(pemail);
         if (email == null) email = "";
         if (!email.equals("")) {
-            t_email.setText(email.trim());
+            SpannableString spanString = new SpannableString(email);
+            spanString.setSpan(new UnderlineSpan(), 0, spanString.length(), 0);
+            t_email.setText(spanString);
+        } else {
+            SpannableString spanString = new SpannableString(ACKNOWLEDGE_YOUR_CONTRIBUTIONS);
+            spanString.setSpan(new UnderlineSpan(), 0, spanString.length(), 0);
+            t_email.setText(spanString);
         }
+
     }
 
     private boolean updateEMail(String newEmailValue) {
@@ -584,9 +594,10 @@ private boolean updateEMail(String newEmailValue) {
                 log.append("ERROR: can't write local configuration (" + pemail + "!");
                 return true;
             }
-            t_email.setText(email.trim());
+            SpannableString spanString = new SpannableString(email.trim());
+            spanString.setSpan(new UnderlineSpan(), 0, spanString.length(), 0);
+            t_email.setText(spanString);
         }
-        t_email.setText(emailTrimmed);
         return false;
     }
 
@@ -2341,11 +2352,12 @@ public void run() {
                         }
                         if (it == 0) {
                             //  first iteration used for mobile warms up if it was in a low freq state
+                            publishProgress("\nRecognition time  (warms up) " + processingTime + " ms \n");
                             continue;
                         }
+                        publishProgress("\nRecognition time " + it + ": " + processingTime + " ms \n");
                         cpuFreqs.add(get_cpu_freqs());
                         processingTimes.add(processingTime);
-                        publishProgress("\nRecognition time " + it + ": " + processingTime + " ms \n");
                     }
                     publishProgress("\nRecognition result:\n " + recognitionResultText + "\n\n");
 

app/src/main/res/layout/activity_main.xml

@@ -154,8 +154,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/log"
-        android:minHeight="12dp"
-        android:textSize="14dp"
+        android:minHeight="28dp"
+        android:textSize="16dp"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:id="@+id/textView"
@@ -168,26 +168,15 @@
         android:layout_height="wrap_content"
         android:hint="acknowledge your contributions!"
         android:inputType="textNoSuggestions|text"
-        android:minHeight="12dp"
-        android:textSize="14dp"
+        android:minHeight="28dp"
+        android:textSize="16dp"
         android:layout_above="@+id/b_about"
         android:layout_alignRight="@+id/b_about"
         android:layout_alignEnd="@+id/b_about"
         android:layout_toEndOf="@+id/btn_start"
         android:layout_alignLeft="@+id/b_sdk"
         android:layout_alignStart="@+id/b_sdk">
     </TextView>
-    <!--<ImageButton-->
-        <!--android:id="@+id/btn_updateEmail"-->
-        <!--style="?android:attr/buttonStyleSmall"-->
-        <!--android:layout_width="wrap_content"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--android:maxHeight="24dp"-->
-        <!--android:text="   "-->
-        <!--android:src="@drawable/abc_edit_text_material"-->
-        <!--android:layout_above="@+id/b_about"-->
-        <!--android:layout_toRightOf="@+id/t_email"-->
-        <!--/>-->
     <SurfaceView
         android:id="@+id/surfaceView1"
         android:layout_width="200dp"