Gave GettingStartedActivity a makeover. Changed System.out.println() calls to Log calls. Moved services into their own package.

app/src/main/AndroidManifest.xml

@@ -118,7 +118,7 @@
             android:name="com.google.firebase.messaging.default_notification_channel_id"
             android:value="default_notification_channel_id"/>
 
-        <service android:name=".MyFirebaseMessagingService">
+        <service android:name=".services.MyFirebaseMessagingService">
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>

app/src/main/java/uprrp/tania/SNSRegister.java

@@ -1,6 +1,7 @@
 package uprrp.tania;
 
 import android.os.AsyncTask;
+import android.util.Log;
 
 import com.amazonaws.auth.CognitoCachingCredentialsProvider;
 import com.amazonaws.services.sns.AmazonSNSClient;
@@ -46,7 +47,7 @@ public class SNSRegister extends AsyncTask <String, Void, String> {
             createNeeded = false;
         }
 
-        System.out.println("Retrieving platform endpoint data...");
+        Log.i(TAG, "Retrieving platform endpoint data...");
         // Look up the platform endpoint and make sure the data in it is current, even if
         // it was just created.
         try {
@@ -70,12 +71,12 @@ public class SNSRegister extends AsyncTask <String, Void, String> {
             createEndpoint(token);
         }
 
-        System.out.println("updateNeeded = " + updateNeeded);
+        Log.d(TAG, "updateNeeded = " + updateNeeded);
 
         if (updateNeeded) {
             // The platform endpoint is out of sync with the current data;
             // update the token and enable it.
-            System.out.println("Updating platform endpoint " + endpointArn);
+            Log.d(TAG, "Updating platform endpoint " + endpointArn);
             Map attribs = new HashMap();
             attribs.put("Token", token);
             attribs.put("Enabled", "true");
@@ -96,7 +97,7 @@ public class SNSRegister extends AsyncTask <String, Void, String> {
 
         String endpointArn = null;
         try {
-            System.out.println("Creating platform endpoint with token " + token);
+            Log.d(TAG, "Creating platform endpoint with token " + token);
             CreatePlatformEndpointRequest cpeReq =
                     new CreatePlatformEndpointRequest()
                             .withPlatformApplicationArn("arn:aws:sns:us-east-1:227586183436:app/GCM/TANIA_Android")
@@ -106,7 +107,7 @@ public class SNSRegister extends AsyncTask <String, Void, String> {
             endpointArn = cpeRes.getEndpointArn();
         } catch (InvalidParameterException ipe) {
             String message = ipe.getErrorMessage();
-            System.out.println("Exception message: " + message);
+            Log.d(TAG, "Exception message: " + message);
             Pattern p = Pattern
                     .compile(".*Endpoint (arn:aws:sns[^ ]+) already exists " +
                             "with the same token.*");

app/src/main/java/uprrp/tania/activities/GettingStartedActivity.java

@@ -77,6 +77,8 @@ public class GettingStartedActivity extends AppCompatActivity {
         // Attach onClick listeners to buttons
         Button createAccountButton = findViewById(R.id.buttonCreateAccount);
         Button loginAccountButton = findViewById(R.id.buttonRecoverAccount);
+        createAccountButton.setTransformationMethod(null); // TODO: this is a workaround I found, any other acceptable solution is welcome
+        loginAccountButton.setTransformationMethod(null); // TODO: this is a workaround I found, any other acceptable solution is welcome
         createAccountButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -112,6 +114,7 @@ public class GettingStartedActivity extends AppCompatActivity {
     }
 
 
+    // TODO: decide which parts in this function to move to a background task
     private void processConsentResult(TaskResult result) {
 
         boolean consented = (boolean) result.getStepResult(CONSENT_DOC).getResult();
@@ -478,6 +481,3 @@ public class GettingStartedActivity extends AppCompatActivity {
 
     }
 }
-
-
-

app/src/main/java/uprrp/tania/MyFirebaseMessagingService.java → app/src/main/java/uprrp/tania/services/MyFirebaseMessagingService.java

@@ -1,4 +1,4 @@
-package uprrp.tania;
+package uprrp.tania.services;
 
 import com.google.firebase.messaging.FirebaseMessagingService;
 import com.google.firebase.messaging.RemoteMessage;
@@ -17,6 +17,7 @@ import android.util.Log;
 import androidx.core.app.NotificationCompat;
 import androidx.core.app.NotificationManagerCompat;
 
+import uprrp.tania.R;
 import uprrp.tania.activities.MainActivity;
 
 public class MyFirebaseMessagingService extends FirebaseMessagingService {

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

@@ -8,100 +8,116 @@
     android:background="@color/rsb_white_60">
 
     <ImageView
-        android:id="@+id/bubble3"
-        android:layout_width="69dp"
-        android:layout_height="25dp"
-        app:layout_constraintBottom_toTopOf="@+id/buttonRecoverAccount"
+        android:id="@+id/bubble1"
+        android:layout_width="@dimen/bubbleSize"
+        android:layout_height="@dimen/bubbleSize"
+        android:layout_marginStart="@dimen/horizontalMargin"
+        android:layout_marginTop="52dp"
+        android:layout_marginEnd="@dimen/horizontalMargin"
+        android:contentDescription="@string/bubbleDescription"
+        app:layout_constraintBottom_toTopOf="@+id/bubble2"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/applicationNameMeaning"
+        app:layout_constraintTop_toBottomOf="@+id/applicationNameLong"
         app:srcCompat="@drawable/circle" />
 
     <ImageView
         android:id="@+id/bubble2"
-        android:layout_width="69dp"
-        android:layout_height="25dp"
+        android:layout_width="@dimen/bubbleSize"
+        android:layout_height="@dimen/bubbleSize"
+        android:layout_marginStart="@dimen/horizontalMargin"
+        android:layout_marginTop="28dp"
+        android:layout_marginEnd="@dimen/horizontalMargin"
+        android:contentDescription="@string/bubbleDescription"
         app:layout_constraintBottom_toTopOf="@+id/bubble3"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/applicationNameMeaning"
-        app:layout_constraintVertical_bias="0.756"
+        app:layout_constraintTop_toBottomOf="@id/bubble1"
+        app:srcCompat="@drawable/circle" />
+
+    <ImageView
+        android:id="@+id/bubble3"
+        android:layout_width="@dimen/bubbleSize"
+        android:layout_height="@dimen/bubbleSize"
+        android:layout_marginStart="@dimen/horizontalMargin"
+        android:layout_marginTop="28dp"
+        android:layout_marginEnd="@dimen/horizontalMargin"
+        android:contentDescription="@string/bubbleDescription"
+        app:layout_constraintBottom_toTopOf="@id/buttonCreateAccount"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/bubble2"
         app:srcCompat="@drawable/circle" />
 
     <TextView
         android:id="@+id/ApplicationName"
-        android:layout_width="259dp"
-        android:layout_height="98dp"
-        android:fontFamily="@font/acme"
-        android:text="TANIA"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/horizontalMargin"
+        android:layout_marginTop="128dp"
+        android:layout_marginEnd="@dimen/horizontalMargin"
+        android:fontFamily="@font/cabin"
+        android:text="@string/appName"
         android:textAlignment="center"
         android:textColor="@color/colorPrimary"
         android:textSize="80sp"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.23" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
-        android:id="@+id/applicationNameMeaning"
-        android:layout_width="336dp"
-        android:layout_height="50dp"
-        android:fontFamily="@font/acme"
-        android:text="Timely And Non-Intrusive Assessments"
+        android:id="@+id/applicationNameLong"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/horizontalMargin"
+        android:layout_marginEnd="@dimen/horizontalMargin"
+        android:fontFamily="@font/cabin"
+        android:text="@string/appNameLong"
         android:textAlignment="center"
-        android:textColor="@color/colorPrimary"
         android:textSize="18sp"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.493"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/ApplicationName"
-        app:layout_constraintVertical_bias="0.0" />
+        app:layout_constraintTop_toBottomOf="@+id/ApplicationName" />
 
     <Button
         android:id="@+id/buttonCreateAccount"
-        android:layout_width="284dp"
-        android:layout_height="60dp"
-        android:backgroundTint="@color/colorPrimary"
-        android:fontFamily="sans-serif-medium"
-        android:text="@string/rss_join_study"
-        android:textAlignment="center"
-        android:textColor="@color/rsb_white_60"
-        android:textSize="18sp"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/horizontalMargin"
+        android:layout_marginTop="52dp"
+        android:layout_marginEnd="@dimen/horizontalMargin"
+        android:background="@drawable/button_background"
+        android:fontFamily="sans-serif-black"
+        android:paddingHorizontal="@dimen/buttonHorizontalPadding"
+        android:paddingVertical="@dimen/buttonVerticalPadding"
+        android:text="@string/createAccountButtonText"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/buttonTextSize"
         android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHeight_max="@dimen/buttonMaxHeight"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/bubble3"
-        app:layout_constraintVertical_bias="0.163" />
+        app:layout_constraintTop_toBottomOf="@id/bubble3" />
 
     <Button
         android:id="@+id/buttonRecoverAccount"
-        android:layout_width="284dp"
-        android:layout_height="60dp"
-        android:layout_marginStart="60dp"
-        android:layout_marginTop="120dp"
-        android:layout_marginEnd="60dp"
-        android:backgroundTint="@color/colorPrimary"
-        android:fontFamily="@font/acme"
-        android:text="Log In"
-        android:textColor="@color/rsb_white_60"
-        android:textSize="18sp"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/horizontalMargin"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="@dimen/horizontalMargin"
+        android:background="@drawable/button_background"
+        android:fontFamily="sans-serif-black"
+        android:paddingHorizontal="@dimen/buttonHorizontalPadding"
+        android:paddingVertical="@dimen/buttonVerticalPadding"
+        android:text="@string/recoverAccountButtonText"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/buttonTextSize"
         android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHeight_max="@dimen/buttonMaxHeight"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/applicationNameMeaning"
-        app:layout_constraintVertical_bias="0.416" />
+        app:layout_constraintTop_toBottomOf="@id/buttonCreateAccount" />
 
-    <ImageView
-        android:id="@+id/bubble1"
-        android:layout_width="69dp"
-        android:layout_height="25dp"
-        app:layout_constraintBottom_toTopOf="@+id/bubble2"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/applicationNameMeaning"
-        app:srcCompat="@drawable/circle" />
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values/dimens.xml

@@ -13,4 +13,5 @@
     <dimen name="sectionDescriptionTextSize">20sp</dimen>
     <dimen name="buttonTextSize">24sp</dimen>
     <dimen name="mainActivityToolbarHeight">54dp</dimen>
+    <dimen name="bubbleSize">18dp</dimen>
 </resources>

app/src/main/res/values/strings.xml

@@ -32,6 +32,7 @@
 <!--    <string name="loginBaseURL">https://tania.uprrp.edu/recoverAccount.php</string>-->
     <!--  General App Configurations  -->
     <string name="appName">TANIA</string>
+    <string name="appNameLong">Timely And Non-Intrusive Assessments</string>
     <string name="surveyToolbarText">Assessment</string>
     <string name="tokenErrorText">There was an error…\nPlease come back later!</string>
     <!--  Assessment Fragment  -->
@@ -58,20 +59,23 @@
     <string name="consentGeneral">If you decide to participate in this study, understand that your participation is completely voluntary and that you have the right to abstain from participating or even withdraw at any time of the study without incurring in any penalty. In the application you will find the instructions to withdraw from the study and stop receiving notifications if you wish. You also have the right not to answer any question if you wish. Your participation in this study will not affect in any way your academic evaluation in the courses in which you are carrying out this research. Finally, you have the right to receive a copy of this document.</string>
     <string name="consentConclusion">If you have any questions or would like more information about this study, please contact Prof. Ramírez Lugo at 787-764-0000 Ext. 88068, at 787-918-5330 or by email at juan.ramirez3@upr.edu at any moment. If you have any questions about your rights as a participant or claim or complaint related to your participation in this study, you may contact the Compliance Officer of the Río Piedras Campus of the University of Puerto Rico, at telephone 764-0000, extension 86773 or cipshi. degi@upr.edu. Your signature on this document means that you have decided to participate voluntarily, that the information presented on this Consent Sheet has been discussed and that you have received a copy of this document. This printed sheet will be stored under lock and key for a period of 5 years after completion of the investigation and will then be shredded and discarded.</string>
     <!--  Getting Started Activity  -->
+    <string name="createAccountButtonText">Join the Study</string>
+    <string name="recoverAccountButtonText">Login</string>
+    <string name="overviewTitleText">Welcome</string>
     <string name="overviewConsentSectionSummaryText">You have been invited to participate in this study whose objectives are (1) to develop and demonstrate the utility of a mobile application (TANIA) to collect perception data of students participating in research experiences and (2) to use TANIA to determine the sources of self-efficacy that lead to career exploration and decision-making in undergraduate students.</string>
     <string name="overviewConsentSectionContentText">This study is been carried out under the supervision of Dr. Juan S. Ramírez Lugo, Department of Biology and Dr. Carlos Corrada Bravo, Department of Computer Sciences at the University of Puerto Rico, Río Piedras Campus. You were selected to participate in this study because you are enrolled in a course that offers a research experience or you voluntarily participate in research with a professor affiliated to the Río Piedras Campus.</string>
+    <string name="timeCommitmentTitleText">Time Commitment</string>
     <string name="timeCommitmentConsentSectionContentText">You are also expected to respond to short questionnaires between 1-3 times per week while you are participating in the research. You will receive notifications at random times during your research experience and answer questions adapted from survey instruments that have been previously validated. It will take you between 1-3 minutes to answer these questionnaires. It is expected that 25 students will participate in this phase of the study.</string>
     <string name="timeCommitmentConsentSectionSummaryText">In the study you will be asked to answer a questionnaire, about your perception of self-efficacy in research, scientific identity and decision-making about your professional career at the beginning and end of your research experience. It will take you between 10-20 minutes to answer this questionnaire.</string>
+    <string name="dataGatheringTitleText">Data Gathering</string>
     <string name="dataGatheringConsentSectionSummaryText">While answering the questions, you may feel uncomfortable because the questions are about your general opinion about science and research and your career. If you feel uncomfortable with the questions, you can stop and choose not to answer the question.</string>
     <string name="dataGatheringConsentSectionContentText">In addition, when you download the application, it will occupy space in the memory of your mobile device and also consume your data plan in the transmission of information when you answer the questionnaires. It is estimated that the application will have a size of 40 Mb (As reference the WhatsApp application is 88.9 Mb). Although at the moment we cannot say exactly how much memory or data you will consume, we understand that both will be minimal. The risks of this study are minimal.</string>
+    <string name="privacyTitleText">Privacy</string>
     <string name="privacyConsentSectionSummaryText">Your identity will be protected throughout the study. Your identifiable information will be handled confidentially and when presenting the results of the investigation you will not be identified.</string>
     <string name="privacyConsentSectionContentText">The information you issue through the application will be through access credentials (username and password) that only you will know. These access credentials will be encrypted and any subsequent association between you and your data will be made by reference to the encrypted information, not your personal identity. The data collected through the questionnaires will be stored digitally on a secure hard drive in the researcher\'s office. These data will also be stored virtually in the cloud, with access limited only to researchers.</string>
+    <string name="dataUseTitleText">Use of Data</string>
     <string name="dataUseConsentSectionSummaryText">The data obtained will be used to improve academic offerings and research experiences. The results of this study may be part of a scientific publication on science education strategies and will serve as a basis to improve the teaching curriculum.</string>
     <string name="dataUseConsentSectionContentText">It may be used to develop proposals for obtaining external funds for research. The officials of the Río Piedras Campus of the University of Puerto Rico and / or federal agencies responsible for ensuring the integrity of the research may require the researcher to prove the data obtained in this study, including this informed consent. The information handled by your device can be intervened or revised by third parties. These people can be people with legitimate or illegitimate access to the device and its content such as a family member, employer, hackers, intruders, etc. In addition, the device that you use may keep track of the information you access or send over the Internet.</string>
-    <string name="overviewTitleText">Welcome</string>
-    <string name="timeCommitmentTitleText">Time Commitment</string>
-    <string name="dataGatheringTitleText">Data Gathering</string>
-    <string name="privacyTitleText">Privacy</string>
-    <string name="dataUseTitleText">Use of Data</string>
     <string name="generalTitleText">General</string>
+    <string name="bubbleDescription">Just a blue bubble for decoration</string>
 </resources>