diff --git a/OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/signin/ArduinoSettingsActivity.java b/OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/signin/ArduinoSettingsActivity.java index 266423d6..13df9e21 100644 --- a/OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/signin/ArduinoSettingsActivity.java +++ b/OpenScienceJournal/whistlepunk_library/src/main/java/com/google/android/apps/forscience/whistlepunk/signin/ArduinoSettingsActivity.java @@ -2,6 +2,7 @@ import android.annotation.SuppressLint; import android.content.Intent; +import android.net.Uri; import android.os.Bundle; import android.view.View; import android.widget.CompoundButton; @@ -63,6 +64,7 @@ protected void onCreate(Bundle savedInstanceState) { mSyncSwitch = findViewById(R.id.section_google_drive_switch); mSyncSwitch.setOnCheckedChangeListener(mSwitchListener); findViewById(R.id.section_google_drive_switch_change).setOnClickListener(v -> startActivity(new Intent(this, GDriveSyncSetupActivity.class))); + findViewById(R.id.redirect_to_id_page_image_view).setOnClickListener(v -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://id.arduino.cc")))); } @Override diff --git a/OpenScienceJournal/whistlepunk_library/src/main/res/layout/activity_arduino_auth_settings.xml b/OpenScienceJournal/whistlepunk_library/src/main/res/layout/activity_arduino_auth_settings.xml index 6de226eb..2bdf6fcf 100644 --- a/OpenScienceJournal/whistlepunk_library/src/main/res/layout/activity_arduino_auth_settings.xml +++ b/OpenScienceJournal/whistlepunk_library/src/main/res/layout/activity_arduino_auth_settings.xml @@ -1,6 +1,7 @@ @@ -20,7 +21,7 @@ android:layout_width="40dp" android:layout_height="40dp" android:layout_marginStart="18dp" - android:background="@null" + android:background="?selectableItemBackgroundBorderless" android:contentDescription="@null" android:scaleType="centerInside" android:src="@drawable/ic_arduino_auth_close" @@ -47,7 +48,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginStart="15dp" - android:layout_marginEnd="30dp" + android:layout_marginEnd="15dp" android:ellipsize="end" android:fontFamily="@font/open_sans_bold" android:gravity="center" @@ -90,24 +91,39 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_marginTop="15dp" + android:layout_marginEnd="15dp" android:fontFamily="@font/open_sans" android:textColor="@color/arduino_gris" android:textSize="16sp" - app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintEnd_toStartOf="@id/redirect_to_id_page_image_view" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/section_arduino_account" /> + app:layout_constraintTop_toBottomOf="@id/section_arduino_account" + tools:text="Lil Nickname" /> + app:layout_constraintTop_toBottomOf="@id/section_arduino_account_nickname" + tools:text="account@email.com" /> + + + app:layout_constraintTop_toBottomOf="@id/section_arduino_account_email" + tools:visibility="visible"> + app:layout_constraintTop_toBottomOf="@id/section_google_drive_switch_layout" + tools:visibility="visible">