Commit a2a75936 authored by Niklas Fix's avatar Niklas Fix 🎓

fix edittext colors and other dark mode colors

parent 55e032ef
......@@ -52,10 +52,10 @@ android {
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta8'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'com.google.android.material:material:1.3.0-alpha01'
implementation 'com.google.android.material:material:1.3.0-alpha03'
implementation 'com.jaredrummler:animated-svg-view:1.0.5'
implementation 'com.google.code.gson:gson:2.8.5'
implementation 'com.squareup.okhttp3:okhttp:3.12.1'
......
......@@ -63,6 +63,7 @@
android:layout_marginStart="@dimen/activity_margin_side"
android:layout_marginTop="50dp"
android:layout_marginEnd="@dimen/activity_margin_side"
android:textColorHint="@color/grey"
android:hint="@string/your_username_or_email"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
......@@ -71,7 +72,12 @@
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/forgot_password_input_text"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:backgroundTint="@color/grey"
android:inputType="text"
android:textColor="@color/darkText"
android:maxLines="1"
android:singleLine="true" />
</com.google.android.material.textfield.TextInputLayout>
......
......@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorPrimary"
android:background="@color/akamu_blue"
tools:context="de.akamu.tudarmstadt.features.signup.email.EmailFragment">
<TextView
......@@ -69,11 +69,10 @@
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:gravity="center"
android:theme="@style/AkamuEditText"
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"
......
<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:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorPrimary"
tools:context="de.akamu.tudarmstadt.features.signup.password.PasswordFragment">
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/textinputlayout_signup_password1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
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"
app:layout_constraintBottom_toTopOf="@+id/textinputlayout_signup_password2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textview_signup_password_description"
app:passwordToggleEnabled="true"
app:passwordToggleTint="@color/white">
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/akamu_blue"
tools:context="de.akamu.tudarmstadt.features.signup.password.PasswordFragment">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/textinputedittext_signup_password1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textPassword"
android:maxLines="1"
android:textColor="@color/textWhite"
app:backgroundTint="@color/textWhite" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/textinputlayout_signup_password1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:hint="@string/hint_signup_enterpassword"
android:textColor="@color/textWhite"
android:textColorHint="@color/textWhite"
android:theme="@style/AkamuEditText"
app:layout_constraintBottom_toTopOf="@+id/textinputlayout_signup_password2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textview_signup_password_description"
app:passwordToggleEnabled="true"
app:passwordToggleTint="@color/white">
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/textinputedittext_signup_password1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textPassword"
android:maxLines="1"
android:textColor="@color/textWhite"
app:backgroundTint="@color/textWhite" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/textinputlayout_signup_password2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="128dp"
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"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:passwordToggleEnabled="true"
app:passwordToggleTint="@color/white">
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/textinputedittext_signup_password2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:imeOptions="actionUnspecified"
android:inputType="textPassword"
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_password2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="128dp"
android:hint="@string/hint_signup_reenterpassword"
android:textColor="@color/textWhite"
android:textColorHint="@color/textWhite"
android:theme="@style/AkamuEditText"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:passwordToggleEnabled="true"
app:passwordToggleTint="@color/white">
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/textinputedittext_signup_password2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:imeOptions="actionUnspecified"
android:inputType="textPassword"
android:maxLines="1"
android:singleLine="true"
android:textColor="@color/textWhite"
app:backgroundTint="@color/textWhite" />
<TextView
android:id="@+id/textview_signup_password_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:paddingEnd="64dp"
android:paddingStart="64dp"
android:textColor="@color/textWhite"
android:text="@string/signup_password_description_head"
android:gravity="center"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</com.google.android.material.textfield.TextInputLayout>
<TextView
android:id="@+id/textview_signup_password_description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="8dp"
android:gravity="center"
android:paddingStart="64dp"
android:paddingEnd="64dp"
android:textColor="@color/textWhite"
android:text="@string/signup_password_description"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/textview_signup_password_description_head" />
<TextView
android:id="@+id/textview_signup_password_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_password_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_password_description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="20dp"
android:layout_marginEnd="8dp"
android:gravity="center"
android:paddingStart="64dp"
android:paddingEnd="64dp"
android:text="@string/signup_password_description"
android:textColor="@color/textWhite"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/textview_signup_password_description_head" />
</androidx.constraintlayout.widget.ConstraintLayout>
<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:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorPrimary"
tools:context="de.akamu.tudarmstadt.features.signup.username.UsernameFragment">
<TextView
android:id="@+id/textview_signup_user_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:paddingEnd="64dp"
android:paddingStart="64dp"
android:gravity="center"
android:text="@string/signup_user_description_head"
android:textStyle="bold"
android:textColor="@color/textWhite"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
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/akamu_blue"
tools:context="de.akamu.tudarmstadt.features.signup.username.UsernameFragment">
<TextView
android:id="@+id/textview_signup_user_description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="24dp"
android:layout_marginEnd="8dp"
android:gravity="center"
android:paddingStart="64dp"
android:paddingEnd="64dp"
android:text="@string/signup_user_description"
android:textColor="@color/textWhite"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textview_signup_user_description_head" />
<TextView
android:id="@+id/textview_signup_user_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:gravity="center"
android:paddingStart="64dp"
android:paddingEnd="64dp"
android:text="@string/signup_user_description_head"
android:textColor="@color/textWhite"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/textinputlayout_signup_username"
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: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"
app:layout_constraintVertical_bias="0.2"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textview_signup_user_description">
<TextView
android:id="@+id/textview_signup_user_description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="24dp"
android:layout_marginEnd="8dp"
android:gravity="center"
android:paddingStart="64dp"
android:paddingEnd="64dp"
android:text="@string/signup_user_description"
android:textColor="@color/textWhite"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textview_signup_user_description_head" />
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/textinputedittext_signup_username"
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_username"
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:theme="@style/AkamuEditText"
android:hint="@string/hint_signup_chooseusername"
app:hintTextColor="@color/textWhite"
android:textColor="@color/textWhite"
android:textColorHint="@color/textWhite"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textview_signup_user_description"
app:layout_constraintVertical_bias="0.2">
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/textinputedittext_signup_username"
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"
android:backgroundTint="@color/textWhite"/>
</com.google.android.material.textfield.TextInputLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
......@@ -14,7 +14,7 @@
<!-- GREY -->
<color name="light_grey">#06718E</color>
<color name="light_grey_material">#1B7B95</color>
<color name="grey">#1F6B80</color>
<color name="grey">#49A1BA</color>
<color name="darkGrey">#D1D1D1</color>
<color name="white">#055165</color>
......
<?xml version="1.0" encoding="utf-8"?>
<resources>
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- BASIC -->
<color name="colorPrimary">#40a8c4</color>
<color name="colorPrimaryDark">#FFFFFF</color>
......
......@@ -11,7 +11,6 @@
<item name="android:windowEnableSplitTouch">false</item>
<item name="android:windowAnimationStyle">@style/WindowAnimationFadeInOut</item>
<!--<item name="android:windowBackground">@color/activityBackground</item> -->
</style>
<!-- === BUTTON STYLES === -->
......@@ -65,8 +64,8 @@
</style>
<!-- === TEXT INPUT STYLES === -->
<style name="TextAppearence.App.TextInputLayout"
parent="@android:style/TextAppearance">
<!--style name="TextAppearence.App.TextInputLayout"
parent="Widget.MaterialComponents.TextInputLayout.FilledBox">
<item name="android:textColor">@color/white</item>
<item name="android:textSize">12sp</item>
<item name="colorControlNormal">@color/white</item>
......@@ -78,6 +77,10 @@
parent="@android:style/TextAppearance">
<item name="android:textColor">@color/colorPrimaryDark</item>
<item name="android:textSize">12sp</item>
</style-->
<style name="AkamuEditText">
<item name="colorAccent">@color/textWhite</item>
</style>
<!-- === LAYOUT STYLES == -->
......
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