Commit 112c5c99 authored by Niklas Fix's avatar Niklas Fix 🎓

fix colors in signup & login

parent 87889025
......@@ -2,12 +2,14 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="@color/white">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/login_form_container"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="@color/white">
<LinearLayout
android:id="@+id/logo_container_login"
......@@ -57,6 +59,7 @@
android:backgroundTint="@color/grey"
android:hint="@string/username"
android:inputType="text"
android:textColor="@color/darkText"
android:maxLines="1"
android:singleLine="true" />
......@@ -86,6 +89,7 @@
android:imeActionLabel="@string/action_sign_in_short"
android:imeOptions="actionUnspecified"
android:inputType="textPassword"
android:textColor="@color/darkText"
android:maxLines="1"
android:singleLine="true"
android:textColorHint="@color/grey" />
......@@ -130,7 +134,6 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
......
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorPrimary"
xmlns:app="http://schemas.android.com/apk/res-auto"
tools:context="de.akamu.tudarmstadt.features.signup.email.EmailFragment">
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"
tools:context="de.akamu.tudarmstadt.features.signup.email.EmailFragment">
<TextView
android:id="@+id/textview_signup_email_description_head"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="128dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:paddingStart="64dp"
android:paddingEnd="64dp"
android:textColor="@color/white"
android:text="@string/signup_email_description_head"
android:textStyle="bold"
android:gravity="center"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/textview_signup_email_description_head"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="128dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:gravity="center"
android:paddingStart="64dp"
android:paddingEnd="64dp"
android:text="@string/signup_email_description_head"
android:textColor="@color/textWhite"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/textview_signup_email_description_top"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:gravity="center"
android:paddingStart="64dp"
android:paddingEnd="64dp"
android:textColor="@color/white"
android:text="@string/signup_email_description_top"
app:layout_constraintBottom_toTopOf="@+id/textinputlayout_signup_email"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textview_signup_email_description_head" />
<TextView
android:id="@+id/textview_signup_email_description_top"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="32dp"
android:layout_marginBottom="8dp"
android:gravity="center"
android:text="@string/signup_email_description_top"
android:textColor="@color/textWhite"
app:layout_constraintBottom_toTopOf="@+id/textinputlayout_signup_email"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textview_signup_email_description_head" />
<TextView
android:id="@+id/textview_signup_email_description_bottom"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="180dp"
android:gravity="center"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:text="@string/signup_email_description_bottom"
android:textColor="@color/textWhite"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textinputlayout_signup_email"
app:layout_constraintVertical_bias="1.0" />
<TextView
android:id="@+id/textview_signup_email_description_bottom"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="180dp"
android:gravity="center"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:textColor="@color/white"
android:text="@string/signup_email_description_bottom"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textinputlayout_signup_email"
app:layout_constraintVertical_bias="1.0" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/textinputlayout_signup_email"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:gravity="center"
android:hint="@string/hint_signup_email"
android:textColor="@color/textWhite"
android:textColorHint="@color/textWhite"
app:errorTextAppearance="@style/TextAppearence.App.TextInputLayout.Error"
app:hintTextAppearance="@style/TextAppearence.App.TextInputLayout"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.529">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/textinputedittext_signup_email"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:imeOptions="actionUnspecified"
android:inputType="text"
android:maxLines="1"
android:singleLine="true"
android:textColor="@color/textWhite"
app:backgroundTint="@color/textWhite" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/textinputlayout_signup_email"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:gravity="center"
android:textColor="@color/white"
android:textColorHint="@color/white"
android:hint="@string/hint_signup_email"
app:hintTextAppearance="@style/TextAppearence.App.TextInputLayout"
app:errorTextAppearance="@style/TextAppearence.App.TextInputLayout.Error"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.529">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/textinputedittext_signup_email"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:imeOptions="actionUnspecified"
android:inputType="text"
android:maxLines="1"
android:singleLine="true"
android:textColor="@color/white"
app:backgroundTint="@color/white" />
</com.google.android.material.textfield.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
......@@ -12,8 +12,8 @@
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:textColor="@color/white"
android:textColorHint="@color/white"
android:textColor="@color/textWhite"
android:textColorHint="@color/textWhite"
android:hint="@string/hint_signup_enterpassword"
app:hintTextAppearance="@style/TextAppearence.App.TextInputLayout"
app:errorTextAppearance="@style/TextAppearence.App.TextInputLayout.Error"
......@@ -30,8 +30,8 @@
android:layout_height="wrap_content"
android:inputType="textPassword"
android:maxLines="1"
android:textColor="@color/white"
app:backgroundTint="@color/white" />
android:textColor="@color/textWhite"
app:backgroundTint="@color/textWhite" />
</com.google.android.material.textfield.TextInputLayout>
......@@ -42,8 +42,8 @@
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="128dp"
android:textColor="@color/white"
android:textColorHint="@color/white"
android:textColor="@color/textWhite"
android:textColorHint="@color/textWhite"
android:hint="@string/hint_signup_reenterpassword"
app:hintTextAppearance="@style/TextAppearence.App.TextInputLayout"
app:errorTextAppearance="@style/TextAppearence.App.TextInputLayout.Error"
......@@ -62,8 +62,8 @@
android:inputType="textPassword"
android:maxLines="1"
android:singleLine="true"
android:textColor="@color/white"
app:backgroundTint="@color/white" />
android:textColor="@color/textWhite"
app:backgroundTint="@color/textWhite" />
</com.google.android.material.textfield.TextInputLayout>
......@@ -77,7 +77,7 @@
android:layout_marginBottom="8dp"
android:paddingEnd="64dp"
android:paddingStart="64dp"
android:textColor="@color/white"
android:textColor="@color/textWhite"
android:text="@string/signup_password_description_head"
android:gravity="center"
android:textStyle="bold"
......@@ -95,7 +95,7 @@
android:gravity="center"
android:paddingStart="64dp"
android:paddingEnd="64dp"
android:textColor="@color/white"
android:textColor="@color/textWhite"
android:text="@string/signup_password_description"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
......
......@@ -17,7 +17,7 @@
android:gravity="center"
android:text="@string/signup_user_description_head"
android:textStyle="bold"
android:textColor="@color/white"
android:textColor="@color/textWhite"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
......@@ -33,7 +33,7 @@
android:paddingStart="64dp"
android:paddingEnd="64dp"
android:text="@string/signup_user_description"
android:textColor="@color/white"
android:textColor="@color/textWhite"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textview_signup_user_description_head" />
......@@ -47,8 +47,8 @@
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:gravity="center"
android:textColorHint="@color/white"
android:textColor="@color/white"
android:textColorHint="@color/textWhite"
android:textColor="@color/textWhite"
android:hint="@string/hint_signup_chooseusername"
app:hintTextAppearance="@style/TextAppearence.App.TextInputLayout"
app:errorTextAppearance="@style/TextAppearence.App.TextInputLayout.Error"
......@@ -66,8 +66,8 @@
android:inputType="text"
android:maxLines="1"
android:singleLine="true"
android:textColor="@color/white"
app:backgroundTint="@color/white" />
android:textColor="@color/textWhite"
app:backgroundTint="@color/textWhite" />
</com.google.android.material.textfield.TextInputLayout>
......
......@@ -15,7 +15,7 @@
<color name="light_grey">#06718E</color>
<color name="light_grey_material">#1B7B95</color>
<color name="grey">#1F6B80</color>
<color name="darkGrey">#666666</color>
<color name="darkGrey">#D1D1D1</color>
<color name="white">#055165</color>
<!-- DUEL COLORS -->
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment