Skip to content
Snippets Groups Projects
Commit cfc26671 authored by George Muresan's avatar George Muresan
Browse files

Merge branches 'master' and 'withoutbit' of...

Merge branches 'master' and 'withoutbit' of https://github.com/georgemuresan/Internship into withoutbit

# Conflicts:
#	app/src/main/res/layout/questionnaire_four.xml
parents afe1cb23 9b01b43e
No related branches found
No related tags found
No related merge requests found
...@@ -118,12 +118,14 @@ public class FirstPage extends AppCompatActivity { ...@@ -118,12 +118,14 @@ public class FirstPage extends AppCompatActivity {
if (!isFirstRun && consent.isChecked() && !nameBox.getText().toString().equals("") && !participantID.getText().toString().equals("")) { if (!isFirstRun && consent.isChecked() && !nameBox.getText().toString().equals("") && !participantID.getText().toString().equals("")) {
//show start activity //show start activity
getSharedPreferences("PREFERENCE", MODE_PRIVATE).edit()
.putBoolean("isFirstRun", false).apply();
startActivity(new Intent(this, MainMenu.class)); startActivity(new Intent(this, MainMenu.class));
} }
getSharedPreferences("PREFERENCE", MODE_PRIVATE).edit()
.putBoolean("isFirstRun", false).apply();
} }
......
...@@ -108,14 +108,14 @@ ...@@ -108,14 +108,14 @@
android:id="@+id/submitButton" android:id="@+id/submitButton"
android:layout_width="102dp" android:layout_width="102dp"
android:layout_height="43dp" android:layout_height="43dp"
android:layout_marginBottom="16dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginTop="2dp" android:layout_marginTop="2dp"
android:text="@string/submitUpdate" android:text="@string/submitUpdate"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintTop_toBottomOf="@+id/yourName2" />
<EditText <EditText
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment