diff --git a/app/src/main/res/drawable/circle_edit_background.xml b/app/src/main/res/drawable/circle_edit_background.xml index 0d3130f..6b14fb2 100644 --- a/app/src/main/res/drawable/circle_edit_background.xml +++ b/app/src/main/res/drawable/circle_edit_background.xml @@ -1,7 +1,7 @@ - + diff --git a/app/src/main/res/layout/activity_conta.xml b/app/src/main/res/layout/activity_conta.xml index 753af84..85eba33 100644 --- a/app/src/main/res/layout/activity_conta.xml +++ b/app/src/main/res/layout/activity_conta.xml @@ -20,11 +20,11 @@ android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" - android:background="@drawable/bg_gradient" + android:background="#FFFFFF" app:title="Definições de Conta" - app:titleTextColor="#FFFFFF" + app:titleTextColor="#212121" app:navigationIcon="@drawable/ic_arrow_back" - app:navigationIconTint="#FFFFFF" /> + app:navigationIconTint="#212121" /> @@ -108,7 +108,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:text="Alterar Foto" - android:textColor="#667eea" + android:textColor="#616161" android:textSize="15sp" android:textStyle="bold" android:clickable="true" @@ -157,11 +157,10 @@ app:boxCornerRadiusBottomEnd="16dp" app:boxStrokeWidth="2dp" app:boxStrokeWidthFocused="2dp" - app:boxStrokeColor="#E0E0E0" - app:boxStrokeColorFocused="#667eea" + app:boxStrokeColor="#BDBDBD" + app:boxStrokeColorFocused="#616161" app:startIconDrawable="@android:drawable/ic_menu_myplaces" - app:startIconTint="#667eea" - app:hintTextColor="#667eea" + app:startIconTint="#616161" app:boxBackgroundMode="outline" style="@style/Widget.Material3.TextInputLayout.OutlinedBox"> @@ -184,12 +183,12 @@ android:layout_width="match_parent" android:layout_height="56dp" android:layout_marginTop="16dp" - android:background="@drawable/button_modern" + android:backgroundTint="#424242" android:text="Guardar Nome" android:textColor="#FFFFFF" android:textSize="16sp" android:textStyle="bold" - android:elevation="4dp" + android:elevation="2dp" android:stateListAnimator="@null" /> diff --git a/app/src/main/res/layout/activity_criarconta.xml b/app/src/main/res/layout/activity_criarconta.xml index 6005de6..ff678c1 100644 --- a/app/src/main/res/layout/activity_criarconta.xml +++ b/app/src/main/res/layout/activity_criarconta.xml @@ -5,33 +5,10 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/bg_gradient" + android:background="#FFFFFF" android:id="@+id/main" android:padding="0dp"> - - - - - + app:layout_constraintTop_toTopOf="parent"> + android:textColor="#212121" + android:letterSpacing="0.05" /> @@ -76,11 +51,12 @@ android:layout_marginStart="24dp" android:layout_marginEnd="24dp" android:layout_marginTop="40dp" - android:elevation="12dp" - app:cardCornerRadius="28dp" + android:elevation="2dp" + app:cardCornerRadius="16dp" app:cardBackgroundColor="#FFFFFF" app:cardUseCompatPadding="true" - app:strokeWidth="0dp" + app:strokeWidth="1dp" + app:strokeColor="#E0E0E0" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/headerSection"> @@ -103,7 +79,7 @@ android:text="Registo" android:textSize="32sp" android:textStyle="bold" - android:textColor="#1A1A1A" + android:textColor="#212121" android:layout_marginBottom="8dp" /> @@ -139,7 +114,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="textEmailAddress" - android:textColor="#1A1A1A" + android:textColor="#212121" android:textColorHint="#9E9E9E" android:textSize="16sp" android:padding="18dp" @@ -153,19 +128,18 @@ android:layout_height="wrap_content" android:layout_marginBottom="20dp" android:hint="Password" - app:boxCornerRadiusTopStart="16dp" - app:boxCornerRadiusTopEnd="16dp" - app:boxCornerRadiusBottomStart="16dp" - app:boxCornerRadiusBottomEnd="16dp" - app:boxStrokeWidth="2dp" + app:boxCornerRadiusTopStart="12dp" + app:boxCornerRadiusTopEnd="12dp" + app:boxCornerRadiusBottomStart="12dp" + app:boxCornerRadiusBottomEnd="12dp" + app:boxStrokeWidth="1dp" app:boxStrokeWidthFocused="2dp" - app:boxStrokeColor="#E0E0E0" - app:boxStrokeColorFocused="#667eea" + app:boxStrokeColor="#BDBDBD" + app:boxStrokeColorFocused="#616161" app:startIconDrawable="@android:drawable/ic_lock_lock" - app:startIconTint="#667eea" - app:hintTextColor="#667eea" + app:startIconTint="#616161" app:endIconMode="password_toggle" - app:endIconTint="#667eea" + app:endIconTint="#616161" app:boxBackgroundMode="outline" style="@style/Widget.Material3.TextInputLayout.OutlinedBox"> @@ -174,7 +148,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="textPassword" - android:textColor="#1A1A1A" + android:textColor="#212121" android:textColorHint="#9E9E9E" android:textSize="16sp" android:padding="18dp" @@ -188,19 +162,18 @@ android:layout_height="wrap_content" android:layout_marginBottom="12dp" android:hint="Confirmar Password" - app:boxCornerRadiusTopStart="16dp" - app:boxCornerRadiusTopEnd="16dp" - app:boxCornerRadiusBottomStart="16dp" - app:boxCornerRadiusBottomEnd="16dp" - app:boxStrokeWidth="2dp" + app:boxCornerRadiusTopStart="12dp" + app:boxCornerRadiusTopEnd="12dp" + app:boxCornerRadiusBottomStart="12dp" + app:boxCornerRadiusBottomEnd="12dp" + app:boxStrokeWidth="1dp" app:boxStrokeWidthFocused="2dp" - app:boxStrokeColor="#E0E0E0" - app:boxStrokeColorFocused="#667eea" + app:boxStrokeColor="#BDBDBD" + app:boxStrokeColorFocused="#616161" app:startIconDrawable="@android:drawable/ic_lock_lock" - app:startIconTint="#667eea" - app:hintTextColor="#667eea" + app:startIconTint="#616161" app:endIconMode="password_toggle" - app:endIconTint="#667eea" + app:endIconTint="#616161" app:boxBackgroundMode="outline" style="@style/Widget.Material3.TextInputLayout.OutlinedBox"> @@ -209,7 +182,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="textPassword" - android:textColor="#1A1A1A" + android:textColor="#212121" android:textColorHint="#9E9E9E" android:textSize="16sp" android:padding="18dp" @@ -222,13 +195,13 @@ android:id="@+id/btnCreateAccount" android:layout_width="match_parent" android:layout_height="60dp" - android:background="@drawable/button_modern" + android:backgroundTint="#424242" android:text="Criar Conta" android:textColor="#FFFFFF" android:textSize="17sp" android:textStyle="bold" android:letterSpacing="0.05" - android:elevation="6dp" + android:elevation="2dp" android:stateListAnimator="@null" android:layout_marginTop="12dp" /> @@ -246,25 +219,24 @@ android:orientation="horizontal" android:gravity="center" android:padding="16dp" + android:layout_marginTop="24dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/cardRegister" - app:layout_constraintTop_margin="24dp"> + app:layout_constraintTop_toBottomOf="@+id/cardRegister"> + android:textColor="#757575" + android:textSize="15sp" /> - - - - - + app:layout_constraintTop_toTopOf="parent"> + android:textColor="#212121" + android:letterSpacing="0.05" /> @@ -75,11 +50,12 @@ android:layout_marginStart="24dp" android:layout_marginEnd="24dp" android:layout_marginTop="40dp" - android:elevation="12dp" - app:cardCornerRadius="28dp" + android:elevation="2dp" + app:cardCornerRadius="16dp" app:cardBackgroundColor="#FFFFFF" app:cardUseCompatPadding="true" - app:strokeWidth="0dp" + app:strokeWidth="1dp" + app:strokeColor="#E0E0E0" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/headerSection"> @@ -97,7 +73,7 @@ android:text="Login" android:textSize="32sp" android:textStyle="bold" - android:textColor="#1A1A1A" + android:textColor="#212121" android:layout_marginBottom="8dp" /> @@ -133,7 +108,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="textEmailAddress" - android:textColor="#1A1A1A" + android:textColor="#212121" android:textColorHint="#9E9E9E" android:textSize="16sp" android:padding="18dp" @@ -147,19 +122,18 @@ android:layout_height="wrap_content" android:layout_marginBottom="12dp" android:hint="Password" - app:boxCornerRadiusTopStart="16dp" - app:boxCornerRadiusTopEnd="16dp" - app:boxCornerRadiusBottomStart="16dp" - app:boxCornerRadiusBottomEnd="16dp" - app:boxStrokeWidth="2dp" + app:boxCornerRadiusTopStart="12dp" + app:boxCornerRadiusTopEnd="12dp" + app:boxCornerRadiusBottomStart="12dp" + app:boxCornerRadiusBottomEnd="12dp" + app:boxStrokeWidth="1dp" app:boxStrokeWidthFocused="2dp" - app:boxStrokeColor="#E0E0E0" - app:boxStrokeColorFocused="#667eea" + app:boxStrokeColor="#BDBDBD" + app:boxStrokeColorFocused="#616161" app:startIconDrawable="@android:drawable/ic_lock_lock" - app:startIconTint="#667eea" - app:hintTextColor="#667eea" + app:startIconTint="#616161" app:endIconMode="password_toggle" - app:endIconTint="#667eea" + app:endIconTint="#616161" app:boxBackgroundMode="outline" style="@style/Widget.Material3.TextInputLayout.OutlinedBox"> @@ -168,7 +142,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:inputType="textPassword" - android:textColor="#1A1A1A" + android:textColor="#212121" android:textColorHint="#9E9E9E" android:textSize="16sp" android:padding="18dp" @@ -184,7 +158,7 @@ android:layout_gravity="end" android:layout_marginBottom="28dp" android:text="Esqueceu a palavra-passe?" - android:textColor="#667eea" + android:textColor="#616161" android:textSize="14sp" android:textStyle="bold" android:clickable="true" @@ -197,13 +171,13 @@ android:id="@+id/btnLogin" android:layout_width="match_parent" android:layout_height="60dp" - android:background="@drawable/button_modern" + android:backgroundTint="#424242" android:text="Entrar" android:textColor="#FFFFFF" android:textSize="17sp" android:textStyle="bold" android:letterSpacing="0.05" - android:elevation="6dp" + android:elevation="2dp" android:stateListAnimator="@null" android:layout_marginTop="4dp" /> @@ -219,25 +193,24 @@ android:orientation="horizontal" android:gravity="center" android:padding="16dp" + android:layout_marginTop="24dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/cardLogin" - app:layout_constraintTop_margin="24dp"> + app:layout_constraintTop_toBottomOf="@+id/cardLogin"> + android:textColor="#757575" + android:textSize="15sp" />