Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/fix/registration fields #12

Merged
merged 7 commits into from
Apr 20, 2019
Merged

Feature/fix/registration fields #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dddbe8e
Merge branch 'feature/fix/text-sizes' of https://github.com/MarcoCade…
marcocadei Apr 19, 2019
27b9ea4
Modificato titolo activity signin per rispecchiare quanto scritto
marcocadei Apr 19, 2019
1ee81cd
Rimosso campo password dalla activity create member
marcocadei Apr 19, 2019
4ae0af6
Aggiunto campo password e ripeti password all'activity create home
marcocadei Apr 19, 2019
c57ee2b
Corretto typo in una stringa
marcocadei Apr 19, 2019
b580973
Modificate stringhe per essere coerenti con lo stile adottato
marcocadei Apr 19, 2019
4acc06f
Merge branch 'develop' into feature/fix/registration-fields
marcocadei Apr 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 32 additions & 6 deletions app/src/main/res/layout/activity_create_home.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@
android:layout_marginBottom="8dp"
android:hint="@string/activity_create_home_hint_name"
android:textColorHint="@color/colorPrimaryLight"
app:layout_constraintBottom_toTopOf="@+id/activity_create_home_input_motto"
app:layout_constraintEnd_toEndOf="@id/activity_create_home_input_motto"
app:layout_constraintStart_toStartOf="@id/activity_create_home_input_motto"
app:layout_constraintBottom_toTopOf="@+id/activity_create_home_input_password"
app:layout_constraintEnd_toEndOf="@id/activity_create_home_input_password"
app:layout_constraintStart_toStartOf="@id/activity_create_home_input_password"
app:layout_constraintTop_toBottomOf="@+id/activity_create_home_text_title">

<com.google.android.material.textfield.TextInputEditText
Expand All @@ -74,25 +74,51 @@
</com.google.android.material.textfield.TextInputLayout>

<com.google.android.material.textfield.TextInputLayout
android:id="@+id/activity_create_home_input_motto"
android:id="@+id/activity_create_home_input_password"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="32dp"
android:layout_marginBottom="8dp"
android:hint="@string/activity_create_home_hint_password"
android:textColorHint="@color/colorPrimaryLight"
app:layout_constraintBottom_toTopOf="@id/activity_create_home_input_repeat_password"
app:layout_constraintEnd_toEndOf="@id/activity_create_home_input_repeat_password"
app:layout_constraintStart_toStartOf="@id/activity_create_home_input_repeat_password"
app:layout_constraintTop_toBottomOf="@+id/activity_create_home_input_name">

<com.google.android.material.textfield.TextInputEditText
android:textSize="@dimen/medium_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textPassword"
android:textColor="@color/colorPrimaryDark" />

</com.google.android.material.textfield.TextInputLayout>

<com.google.android.material.textfield.TextInputLayout
android:id="@+id/activity_create_home_input_repeat_password"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="32dp"
android:layout_marginBottom="16dp"
android:hint="@string/activity_create_home_hint_motto"
android:hint="@string/activity_create_home_hint_password_repeat"
android:textColorHint="@color/colorPrimaryLight"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/activity_create_home_input_name">
app:layout_constraintTop_toBottomOf="@+id/activity_create_home_input_password">

<com.google.android.material.textfield.TextInputEditText
android:textSize="@dimen/medium_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textPassword"
android:textColor="@color/colorPrimaryDark" />

</com.google.android.material.textfield.TextInputLayout>
Expand Down
31 changes: 3 additions & 28 deletions app/src/main/res/layout/activity_create_member.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
android:layout_marginBottom="8dp"
android:hint="@string/activity_create_member_input_age"
android:textColorHint="@color/colorPrimaryLight"
app:layout_constraintBottom_toTopOf="@+id/activity_create_member_input_password"
app:layout_constraintBottom_toTopOf="@+id/activity_create_member_radio_gender"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/activity_create_member_input_name">
Expand All @@ -104,31 +104,6 @@

</com.google.android.material.textfield.TextInputLayout>

<com.google.android.material.textfield.TextInputLayout
android:id="@+id/activity_create_member_input_password"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
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:hint="@string/activity_create_member_input_password"
android:textColorHint="@color/colorPrimaryLight"
app:layout_constraintBottom_toTopOf="@+id/activity_create_member_radio_gender"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/activity_create_member_input_age">

<com.google.android.material.textfield.TextInputEditText
android:textSize="@dimen/medium_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textPassword"
android:textColor="@color/colorPrimaryDark" />

</com.google.android.material.textfield.TextInputLayout>

<TextView
android:id="@+id/activity_create_member_text_radio_gender"
android:layout_width="wrap_content"
Expand All @@ -142,7 +117,7 @@
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintHorizontal_chainStyle="spread"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/activity_create_member_input_password" />
app:layout_constraintTop_toBottomOf="@+id/activity_create_member_input_age" />

<RadioGroup
android:id="@+id/activity_create_member_radio_gender"
Expand All @@ -158,7 +133,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/activity_create_member_text_radio_gender"
app:layout_constraintTop_toBottomOf="@+id/activity_create_member_input_password">
app:layout_constraintTop_toBottomOf="@+id/activity_create_member_input_age">

<RadioButton
android:id="@+id/activity_create_member_radio_gender_male"
Expand Down
9 changes: 5 additions & 4 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<string name="activity_enter_btn_login">Entra nella tua casa</string>
<string name="activity_enter_logo_description">Logo di APPartment</string>

<string name="activity_signin_text_title">Accedi</string>
<string name="activity_signin_text_title">Entra nella tua casa</string>
<string name="activity_signin_img_title_description">Simbolo di login</string>
<string name="activity_signin_hint_housename">Nome casa</string>
<string name="activity_signin_hint_housename">Nome della casa</string>
<string name="activity_signin_hint_username">Username</string>
<string name="activity_signin_hint_password">Password</string>

Expand All @@ -23,8 +23,9 @@
<string name="activity_create_member_text_radio_gender">Genere</string>
<string name="activity_create_member_text_radio_role">Ruolo</string>

<string name="activity_create_home_hint_name">Nome casa</string>
<string name="activity_create_home_hint_motto">Motto della casa (opzionale)</string>
<string name="activity_create_home_hint_name">Nome della casa</string>
<string name="activity_create_home_hint_password">Password della casa</string>
<string name="activity_create_home_hint_password_repeat">Ripeti password della casa</string>
<string name="activity_create_home_text_title">Crea la tua casa</string>
<string name="activity_create_home_img_title_description">Icona di una casa</string>

Expand Down