Experience Registration Activity got a makeover, as well as other minor changes/refactoring

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

@@ -1,12 +1,5 @@
-/*************************************************************
- * By: Coralys Cubero Rivera
- * Date: 2019
- *************************************************************/
-
 package uprrp.tania;
 
-import android.content.Context;
-import android.content.Intent;
 import android.os.AsyncTask;
 import android.util.Log;
 
@@ -15,87 +8,88 @@ import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.UnsupportedEncodingException;
 import java.net.URL;
-import java.net.URLConnection;
 import java.net.URLEncoder;
 
-import uprrp.tania.activities.MainActivity;
+import javax.net.ssl.HttpsURLConnection;
 
-public class SendActivateExperienceToServer extends AsyncTask <String, String, String> {
+public class SendActivateExperienceToServer extends AsyncTask<String, String, String> {
 
-    private Context context;
+    private final String TAG = "SendActivateExperience";
+    private final URLEventListener myCallBack;
+    private URLEventListener myCallback;
 
-    public SendActivateExperienceToServer(Context context){
-        this.context = context.getApplicationContext();
+    public SendActivateExperienceToServer(URLEventListener callback) {
+        this.myCallBack = callback;
     }
 
     @Override
     protected String doInBackground(String... strings) {
-        String jsonActivateExperience  = "";
 
-        try {
-            jsonActivateExperience = URLEncoder.encode("data", "UTF-8") + "=" + URLEncoder.encode(strings[0], "UTF-8");
+        String experienceRegistrationJSON = strings[0]; // array will only ever contain a single element
+        String jsonActivateExperience = "";
 
+        // Encode data
+        try {
+            jsonActivateExperience = URLEncoder.encode("data", "UTF-8") + "=" + URLEncoder.encode(experienceRegistrationJSON, "UTF-8");
         } catch (UnsupportedEncodingException e) {
+            Log.e(TAG, "Couldn't encode the following JSON: " + experienceRegistrationJSON);
             e.printStackTrace();
+            return null;
         }
 
-        String serverReply = "";
-        BufferedReader serverReader;
-
         // Send data
-        try
-        {
-            // Defined URL  where to send data
-            URL url = new URL("https://tania.uprrp.edu/inscripcionExperiencia.php");
+        try {
 
             // Send POST data request
-            URLConnection conn = url.openConnection();
+            URL url = new URL("https://tania.uprrp.edu/inscripcionExperiencia.php"); // TODO: extract URL into @string/activateExperienceURL
+            HttpsURLConnection conn = (HttpsURLConnection) url.openConnection();
             conn.setDoOutput(true);
             OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream());
             wr.write(jsonActivateExperience);
             wr.flush();
 
             // Get the server response
-            serverReader = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+            BufferedReader serverReader = new BufferedReader(new InputStreamReader(conn.getInputStream()));
             StringBuilder serverResponse = new StringBuilder();
-            String serverResponseLine;
 
-            // Read Server Response
-            while((serverResponseLine = serverReader.readLine()) != null)
-            {
-                // Append server response in string
-                serverResponse.append(serverResponseLine);
+            String line = "";
+            while(line != null) {
+                serverResponse.append(line);
+                line = serverReader.readLine();
             }
 
-            serverReply = serverResponse.toString();
-        }
-        catch(Exception ex) {
-            Log.e("ERROR ACTIVATING EXPERIENCE FOR THE USER", ex.getMessage());
+            String response = serverResponse.toString();
+            if(response.startsWith("Success")) {
+                return response;
+            } else {
+                return null;
+            }
+
+
+        } catch(Exception e) {
+            Log.e("Couldn't communicate with server while activating experience!", e.getMessage());
         }
 
-        return serverReply;
+        return null;
+
     }
 
     @Override
-    protected void onPostExecute(String s) {
-        Log.d("ACTIVATE EXPERIENCE RESPOND", "The server's response is: " + s);
-
-        String ss = s.substring(0,6);
-        String se = s.substring(0,7);
-        if (ss.equals("Succes")){
-
-            try {
-                Intent intent = new Intent(context, MainActivity.class);
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                context.startActivity(intent);
-            }
-            catch (Exception e){
-                Log.d("ACTIVATE EXP TO MAIN", e.getMessage());
-            }
+    protected void onPostExecute(String response) {
 
+        if(this.myCallBack == null) {
+            this.myCallBack.onFailure(new Exception("Callback wasn't initialized first!"));
+            return;
+        }
 
+        if(response == null) {
+            this.myCallback.onFailure(new Exception("Error occurred during transaction!"));
+            return;
         }
 
+        Log.d("ACTIVATE EXPERIENCE RESPONSE", "The server's response is: " + response);
+        this.myCallBack.onSuccess();
+
     }
 
 }

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

@@ -4,6 +4,7 @@ import uprrp.tania.models.AssessmentModel;
 import uprrp.tania.models.UserStatusModel;
 
 public class URLEventListener {
+    public void onSuccess() {};
     public void onSuccess(AssessmentModel assessment) {};
     public void onSuccess(UserStatusModel userStatus) {};
     public void onFailure(Exception e) {};

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

@@ -1,13 +1,11 @@
-/*************************************************************
- * By: Coralys Cubero Rivera
- * Date: 2019
- *************************************************************/
-
 package uprrp.tania.activities;
 
+import android.app.ProgressDialog;
+import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Handler;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
@@ -20,62 +18,127 @@ import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.firebase.iid.FirebaseInstanceId;
 import com.google.firebase.iid.InstanceIdResult;
 
+import org.json.JSONException;
 import org.json.JSONObject;
 
 import uprrp.tania.R;
 import uprrp.tania.SendActivateExperienceToServer;
+import uprrp.tania.URLEventListener;
 
 public class ExperienceRegistrationActivity  extends AppCompatActivity {
 
-    String device_token;
-    String id_experience;
+    private final String TAG = "ExperienceRegistrationActivity";
+    private String device_token;
+    private String id_experience;
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
+
+        // Start constructor and fetch UI components
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_experience_registration);
+        final Button experienceRegistrationButton = findViewById(R.id.buttonEnterExperience);
 
-        //Let's get the device's token
+        // Change all caps text to normal capitalization
+        // TODO: this is a workaround I found, any other acceptable solution is welcome
+        experienceRegistrationButton.setTransformationMethod(null);
+
+        // Request to Firebase...
         FirebaseInstanceId.getInstance().getInstanceId().addOnSuccessListener(new OnSuccessListener<InstanceIdResult>() {
             @Override
             public void onSuccess(InstanceIdResult instanceIdResult) {
-                device_token = instanceIdResult.getToken();
+
+            // Get device's token
+            device_token = instanceIdResult.getToken();
+
+            // Set onClick listener on button
+            experienceRegistrationButton.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+
+                    // Initiate progress dialog
+                    // TODO: find substitute for this deprecated dialog box
+                    final ProgressDialog progressDialog = ProgressDialog.show(ExperienceRegistrationActivity.this,
+                            "Registering in Experience",
+                            "This shouldn't take long");
+
+                    if(!id_experience.equals("") && id_experience != null) {
+                        try {
+
+                            // Create JSON with details we'll send
+                            JSONObject experienceCodeJSON = new JSONObject();
+                            experienceCodeJSON.put("token", device_token);
+                            experienceCodeJSON.put("id_experiencia", id_experience);
+                            Log.d("EXPERIENCE CODE JSON", experienceCodeJSON.toString());
+
+                            // Send registration request to server
+                            SendActivateExperienceToServer experienceRegistrationTask = new SendActivateExperienceToServer(new URLEventListener() {
+                                @Override
+                                public void onSuccess() {
+                                    progressDialog.dismiss();
+                                    Context context = ExperienceRegistrationActivity.this;
+                                    Intent intent = new Intent(context, MainActivity.class);
+                                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                                    context.startActivity(intent);
+                                    Toast.makeText(getApplicationContext(), "You have been registered!", Toast.LENGTH_LONG).show();
+                                }
+
+                                @Override
+                                public void onFailure(Exception e) {
+                                    progressDialog.dismiss();
+                                    // TODO: restrict double registration (maybe in backend?)
+                                    Toast.makeText(ExperienceRegistrationActivity.this, "Oops! Something went wrong...", Toast.LENGTH_LONG).show();
+                                    Log.e(TAG, "Error occurred while sending registration request to server...");
+                                    e.printStackTrace();
+                                }
+                            });
+
+                            experienceRegistrationTask.execute(experienceCodeJSON.toString());
+
+                            // UNCOMMENT THIS FOR TESTING (REMEMBER TO COMMENT .execute() LINE)
+                            /*
+                            Handler handler = new Handler();
+                            handler.postDelayed(new Runnable() {
+                                public void run() {
+                                    progressDialog.dismiss();
+                                    if(false) { // Imitate success
+                                        Context context = ExperienceRegistrationActivity.this;
+                                        Intent intent = new Intent(context, MainActivity.class);
+                                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                                        context.startActivity(intent);
+                                        Toast.makeText(getApplicationContext(), "You have been registered!", Toast.LENGTH_LONG).show();
+                                    } else { // Imitate failure
+                                        Toast.makeText(ExperienceRegistrationActivity.this, "Oops! Something went wrong...", Toast.LENGTH_LONG).show();
+                                    }
+                                }
+                            }, 5000);
+                            */
+                            // UNCOMMENT THIS FOR TESTING (REMEMBER TO COMMENT .execute() LINE)
+
+                        } catch (JSONException e) {
+                            progressDialog.dismiss();
+                            Toast.makeText(ExperienceRegistrationActivity.this, "Oops! Something went wrong...", Toast.LENGTH_LONG).show();
+                            Log.e(TAG, "Error occurred while preparing JSON for server");
+                            e.printStackTrace();
+                        }
+                    } else {
+                        progressDialog.dismiss();
+                        Toast.makeText(ExperienceRegistrationActivity.this, "Invalid URL!", Toast.LENGTH_LONG).show();
+                        Log.d(TAG, "Invalid query parameter found (" + id_experience + ")");
+                    }
+                }
+            });
             }
         });
 
+        // Fetch experience ID from URL (only if we launched this Activity from Browser)
         Intent intent = getIntent();
-        if (Intent.ACTION_VIEW.equals(intent.getAction())) {
+        if(Intent.ACTION_VIEW.equals(intent.getAction())) {
             Uri uri = intent.getData();
-            assert uri != null;
+            assert uri != null; // TODO: figure out if this causes crashes...
             id_experience = uri.getQueryParameter("id");
         }
 
-        final JSONObject experienceCodeJSON = new JSONObject();
-
-        final Button enterExperience = findViewById(R.id.buttonEnterExperience);
-        enterExperience.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                try {
-                    if (!id_experience.equals("")){
-                        experienceCodeJSON.put("token", device_token);
-                        experienceCodeJSON.put("id_experiencia", id_experience);
-
-
-                        Log.d("EXPERIENCE CODE JSON", experienceCodeJSON.toString());
-
-                        SendActivateExperienceToServer sendActivateExperienceToServer = new SendActivateExperienceToServer(getApplicationContext());
-                        sendActivateExperienceToServer.execute(experienceCodeJSON.toString());
-
-                    }
-                    else{
-                        Toast.makeText(ExperienceRegistrationActivity.this, "The password and confirmation must match!", Toast.LENGTH_LONG).show();
-                    }
-
-
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        });
     }
+
 }

app/src/main/java/uprrp/tania/fragments/AssessmentsFragment.java

@@ -62,9 +62,9 @@ public class AssessmentsFragment extends Fragment {
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 
-        // Get reference for this fragment
+        // Get reference for this fragment and other components
         final View thisFragment = inflater.inflate(R.layout.fragment_assessments, container, false);
-        final AppCompatButton surveyButton = thisFragment.findViewById(R.id.survey_button);
+        final AppCompatButton surveyButton = thisFragment.findViewById(R.id.surveyButton);
         final Button refreshButton = thisFragment.findViewById(R.id.refreshButton); // TODO: check Button vs. AppCompatButton
 
         // Change all caps text to normal capitalization
@@ -113,7 +113,7 @@ public class AssessmentsFragment extends Fragment {
         // Get text fields and initialize other stuff
         final TextView statusTextView = thisFragment.findViewById(R.id.statusTextView);
         final TextView nextSurveyTextView = thisFragment.findViewById(R.id.nextSurveyTextView);
-        final Button surveyButton = thisFragment.findViewById(R.id.survey_button);
+        final Button surveyButton = thisFragment.findViewById(R.id.surveyButton);
         final Button refreshButton = thisFragment.findViewById(R.id.refreshButton);
 
         // Change UI to indicate loading is happening
@@ -132,13 +132,16 @@ public class AssessmentsFragment extends Fragment {
                     nextSurveyTextView.setText(userStatus.getTimeToNext());
                     nextSurveyTextView.setVisibility(View.VISIBLE);
 
-                    // If a survey is available, show "Answer" button (else, show "Refresh" button)
+                    // Hide refresh button (it only refreshes user status, anyways so...)
+                    refreshButton.setVisibility(View.GONE);
+
+                    // Toggle "Answer" button visibility depending on survey availability
+                    // TODO: Decide whether to show the button regardless of anything,
+                    //  since this may be optional functionally, but important for UX
                     if(userStatus.surveyAvailable()) {
-                        refreshButton.setVisibility(View.GONE);
                         surveyButton.setVisibility(View.VISIBLE);
                     } else {
                         surveyButton.setVisibility(View.GONE);
-                        refreshButton.setVisibility(View.VISIBLE);
                     }
 
                 } else {
@@ -215,19 +218,11 @@ public class AssessmentsFragment extends Fragment {
     }
 
     private void launchSurvey(AssessmentModel assessment) {
-
-        // Set id_subquestionnair
         this.id_subquestionnair = assessment.getID();
-
         List<Step> allSteps = this.prepareSurveySteps(assessment);
-
-        // Create a task wrapping the steps
         OrderedTask task = new OrderedTask(SAMPLE_SURVEY, allSteps);
-
-        // Create an activity using the task and set a delegate
         Intent intent = ViewTaskActivity.newIntent(getContext(), task);
         startActivityForResult(intent, REQUEST_SURVEY);
-
     }
 
     private void processSurveyResult(TaskResult result) {

app/src/main/java/uprrp/tania/models/UserStatusModel.java

@@ -12,27 +12,24 @@ public class UserStatusModel {
     private int surveys_completed;
     private int surveys_sent;
     private String time_to_next;
+    private boolean available_now;
 
     public boolean isEnrolled() {
         return true;
     }
 
     public boolean surveyAvailable() {
-        // WARNING: Condition might change in the future. Don't change if statement for clarity.
-        if(this.time_to_next.equals("::") || this.time_to_next.equals("0:0:0")) {
-            return true;
-        } else { // TODO: add comparison to null, which signifies experience has ran out of moments
-            return false;
-        }
+        return this.available_now;
     }
 
     public boolean ranOutOfMoments() {
-        return this.time_to_next == null; // TODO: confirm this is going to be used
+        // NOTE: null signifies experience has ran out of moments
+        return this.time_to_next == null;
     }
 
     public String getTimeToNext() {
         if(this.ranOutOfMoments()) {
-            return "No surveys for now. Come back later!";
+            return "No more surveys for now.\nCome back later!";
         } else if(this.surveyAvailable()) {
             return "Survey available!";
         } else {
@@ -42,7 +39,7 @@ public class UserStatusModel {
 
     private String formatTimeToNext() {
 
-        // Format is DD:HH:MM
+        // Format is DD:HH:MM (can be negative if survey can be answered)
         String[] parts = this.time_to_next.split(":");
         int days = Integer.parseInt(parts[0]);
         int hours = Integer.parseInt(parts[1]);

app/src/main/java/uprrp/tania/networking/FetchAssessment.java

@@ -37,7 +37,8 @@ public class FetchAssessment extends AsyncTask<String, Void, JSONObject> {
         String deviceToken = deviceTokenArray[0]; // array will only ever contain a single element
 
         try {
-            String getMomentsBaseURL = "https://tania.uprrp.edu/getSubQ2.php?tk=";  // TODO: extract URL into @string/getMomentsBaseURL
+
+            String getMomentsBaseURL = "https://tania.uprrp.edu/getSubQ2.php?tk="; // TODO: extract URL into @string/getMomentsBaseURL
             URL url = new URL(getMomentsBaseURL + deviceToken);
             Log.d(TAG, "token:" + deviceToken); // log
             Log.d(TAG, "url:" + url.toString()); // log

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

@@ -2,7 +2,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/coordinatorLayout2"
+    android:id="@+id/ConstraintLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context="uprrp.tania.activities.ConsentPdfViewerActivity">
@@ -16,12 +16,12 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/appBarLayout2">
+        app:layout_constraintTop_toBottomOf="@+id/appBarLayout">
 
     </com.github.barteksc.pdfviewer.PDFView>
 
     <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appBarLayout2"
+        android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="61dp"
         android:theme="@style/Theme.MarleApp.AppBarOverlay"

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

@@ -3,66 +3,62 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/colorPrimary">
+    android:layout_height="match_parent">
 
     <TextView
         android:id="@+id/textViewActivateExperience"
-        android:layout_width="312dp"
-        android:layout_height="46dp"
-        android:background="@color/textColor1"
-        android:fontFamily="@font/acme"
-        android:text="Activate Experience"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/horizontalMargin"
+        android:layout_marginTop="@dimen/verticalMargin"
+        android:layout_marginEnd="@dimen/horizontalMargin"
+        android:layout_marginBottom="16dp"
+        android:fontFamily="@font/cabin"
+        android:text="@string/experienceRegistrationTitleText"
         android:textAlignment="center"
         android:textColor="@color/textColor2"
-        android:textSize="30sp"
+        android:textSize="@dimen/sectionTitleTextSize"
         android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/buttonEnterExperience"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.494"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/guideline5"
-        app:layout_constraintVertical_bias="0.177" />
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline5"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        app:layout_constraintGuide_begin="75dp" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/textViewConfirmMessage"
-        android:layout_width="317dp"
-        android:layout_height="64dp"
-        android:background="@color/textColor1"
-        android:fontFamily="@font/acme"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/horizontalMargin"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="@dimen/horizontalMargin"
+        android:fontFamily="sans-serif"
         android:gravity="center"
-        android:text="Click the button below to enter the research experience you are participating in."
+        android:text="@string/experienceRegistrationDescriptionText"
         android:textAlignment="center"
-        android:textColor="@color/textColor2"
         android:textSize="18sp"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.496"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textViewActivateExperience"
-        app:layout_constraintVertical_bias="0.058" />
+        app:layout_constraintTop_toBottomOf="@+id/textViewActivateExperience" />
 
     <Button
         android:id="@+id/buttonEnterExperience"
-        android:layout_width="314dp"
-        android:layout_height="43dp"
-        android:background="@color/colorAccent"
-        android:fontFamily="@font/acme"
-        android:text="ENTER "
-        android:textColor="@color/textColor2"
-        android:textSize="18sp"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/horizontalMargin"
+        android:layout_marginEnd="@dimen/horizontalMargin"
+        android:layout_marginBottom="@dimen/verticalMargin"
+        android:background="@drawable/button_background"
+        android:fontFamily="sans-serif-black"
+        android:paddingHorizontal="@dimen/buttonHorizontalPadding"
+        android:paddingVertical="@dimen/buttonVerticalPadding"
+        android:text="@string/experienceRegistrationButtonText"
+        android:textColor="@android:color/white"
+        android:textSize="@dimen/buttonTextSize"
+        android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.494"
+        app:layout_constraintHeight_max="@dimen/buttonMaxHeight"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textViewConfirmMessage"
-        app:layout_constraintVertical_bias="0.07" />
+        app:layout_constraintTop_toBottomOf="@id/textViewActivateExperience" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -12,7 +12,7 @@
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="54dp"
+        android:layout_height="@dimen/mainActivityToolbarHeight"
         android:background="@color/colorPrimary"
         android:minHeight="?attr/actionBarSize"
         android:theme="?attr/actionBarTheme"
@@ -47,7 +47,6 @@
         app:itemIconTint="@color/bottom_nav_selector"
         app:itemTextColor="@color/bottom_nav_selector"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintHorizontal_bias="1.0"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:menu="@menu/bottom_navigation" />

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

@@ -8,7 +8,7 @@
     <androidx.appcompat.widget.AppCompatButton
         android:id="@+id/refreshButton"
         android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:layout_marginStart="@dimen/horizontalMargin"
         android:layout_marginEnd="@dimen/horizontalMargin"
@@ -24,15 +24,14 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHeight_max="@dimen/buttonMaxHeight"
-        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/statusTextView"
         tools:visibility="gone" />
 
     <androidx.appcompat.widget.AppCompatButton
-        android:id="@+id/survey_button"
+        android:id="@+id/surveyButton"
         android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:layout_marginStart="@dimen/horizontalMargin"
         android:layout_marginEnd="@dimen/horizontalMargin"
@@ -78,7 +77,7 @@
         android:textSize="18sp"
         android:textStyle="bold"
         android:visibility="gone"
-        app:layout_constraintBottom_toTopOf="@+id/survey_button"
+        app:layout_constraintBottom_toTopOf="@+id/surveyButton"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"

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

@@ -40,7 +40,7 @@
     <Button
         android:id="@+id/withdrawButton"
         android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/horizontalMargin"
         android:layout_marginEnd="@dimen/horizontalMargin"
         android:layout_marginBottom="@dimen/verticalMargin"

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

@@ -12,4 +12,5 @@
     <dimen name="sectionTitleTextSize">32sp</dimen>
     <dimen name="sectionDescriptionTextSize">20sp</dimen>
     <dimen name="buttonTextSize">24sp</dimen>
+    <dimen name="mainActivityToolbarHeight">54dp</dimen>
 </resources>

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

@@ -34,4 +34,8 @@
     <string name="withdrawTitleText">Withdraw from Study</string>
     <string name="withdrawButtonText">Withdraw</string>
     <string name="withdrawing_text">If you no longer want to participate in this research study, you can choose to withdraw. By withdrawing, you understand that your decision is final and your account on TANIA will be removed without any chance of recovery.</string>
+    <!--  Experience Registration Activity  -->
+    <string name="experienceRegistrationTitleText">Activate Experience</string>
+    <string name="experienceRegistrationDescriptionText">Click the button below to enter the research experience you are participating in.</string>
+    <string name="experienceRegistrationButtonText">Enter</string>
 </resources>