Skip to content

Commit

Permalink
-dimens added
Browse files Browse the repository at this point in the history 
-add note layout updated
  • Loading branch information
@jclemus91
jclemus91 authored and Julio Lemus committed Jul 15, 2019
1 parent 02bb7cf commit 28b5bf7
Show file tree
Hide file tree
Showing 6 changed files with 91 additions and 46 deletions.
109 changes: 74 additions & 35 deletions Notes/app/src/main/res/layout/add_note_fragment.xml
View file
Original file line number Diff line number Diff line change
@@ -1,43 +1,82 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http:https://schemas.android.com/apk/res/android"
xmlns:app="http:https://schemas.android.com/apk/res-auto"
xmlns:tools="http:https://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.add.AddNoteFragment">
<EditText
android:layout_width="0dp"
android:layout_height="wrap_content"
android:inputType="textPersonName"
android:ems="10"
xmlns:android="http:https://schemas.android.com/apk/res/android"
xmlns:app="http:https://schemas.android.com/apk/res-auto"
xmlns:tools="http:https://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.add.AddNoteFragment"
>

<com.google.android.material.textfield.TextInputLayout
android:id="@+id/titleInput"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/spacing_sm"
android:layout_marginLeft="@dimen/spacing_sm"
android:layout_marginTop="@dimen/spacing_md"
android:layout_marginEnd="@dimen/spacing_sm"
android:layout_marginRight="@dimen/spacing_sm"
android:hint="@string/add_note_title_hint"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
>

<com.google.android.material.textfield.TextInputEditText
android:id="@+id/etTitle"
android:layout_marginTop="32dp"
android:hint="@string/add_note_title_hint"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginStart="16dp"
app:layout_constraintStart_toStartOf="parent"
android:layout_marginLeft="16dp" android:layout_marginEnd="16dp"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginRight="16dp"/>
<EditText
android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textPersonName"
android:ems="10"
android:hint="@string/add_note_description_hint"
android:inputType="textPersonName"
android:singleLine="true"
/>
</com.google.android.material.textfield.TextInputLayout>

<com.google.android.material.textfield.TextInputLayout
android:id="@+id/messageInput"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_md"
android:hint="@string/add_note_description_hint"
app:layout_constraintEnd_toEndOf="@+id/titleInput"
app:layout_constraintStart_toStartOf="@+id/titleInput"
app:layout_constraintTop_toBottomOf="@+id/titleInput"
>

<com.google.android.material.textfield.TextInputEditText
android:id="@+id/etDescription"
app:layout_constraintEnd_toEndOf="@+id/etTitle"
app:layout_constraintStart_toStartOf="@+id/etTitle"
app:layout_constraintTop_toBottomOf="@+id/etTitle"
android:layout_marginTop="24dp"/>
<Button
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/buttonSave"
android:text="@string/add_note_save"
app:layout_constraintEnd_toEndOf="@+id/etDescription"
app:layout_constraintStart_toStartOf="@+id/etDescription"
app:layout_constraintTop_toBottomOf="@+id/etDescription"
android:layout_marginTop="24dp"/>
android:ems="10"
android:inputType="textImeMultiLine"
/>
</com.google.android.material.textfield.TextInputLayout>

<Button
android:id="@+id/buttonCancel"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_lg"
android:text="@string/add_note_cancel"
android:textColor="@android:color/white"
app:layout_constraintEnd_toStartOf="@+id/buttonSave"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="@+id/messageInput"
app:layout_constraintTop_toBottomOf="@id/messageInput"
/>

<Button
android:id="@+id/buttonSave"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_lg"
android:text="@string/add_note_save"
android:textColor="@android:color/white"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/buttonCancel"
app:layout_constraintTop_toBottomOf="@id/messageInput"
/>

</androidx.constraintlayout.widget.ConstraintLayout>
8 changes: 4 additions & 4 deletions Notes/app/src/main/res/layout/note_detail_fragment.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,22 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:id="@+id/textView"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp" android:layout_marginTop="16dp"/>
android:layout_marginLeft="@dimen/spacing_md" android:layout_marginStart="@dimen/spacing_md" android:layout_marginTop="@dimen/spacing_md"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/tvTitle"
app:layout_constraintTop_toBottomOf="@+id/textView" app:layout_constraintStart_toStartOf="@+id/textView"
android:layout_marginTop="8dp"/>
android:layout_marginTop="@dimen/spacing_sm"/>
<TextView
android:text="@string/note_detail_description_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/textView3" app:layout_constraintStart_toStartOf="@+id/tvTitle"
app:layout_constraintTop_toBottomOf="@+id/tvTitle" android:layout_marginTop="32dp"/>
app:layout_constraintTop_toBottomOf="@+id/tvTitle" android:layout_marginTop="@dimen/spacing_xl"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/tvDescription" app:layout_constraintStart_toStartOf="@+id/textView3"
app:layout_constraintTop_toBottomOf="@+id/textView3" android:layout_marginTop="8dp"/>
app:layout_constraintTop_toBottomOf="@+id/textView3" android:layout_marginTop="@dimen/spacing_sm"/>
</androidx.constraintlayout.widget.ConstraintLayout>
8 changes: 4 additions & 4 deletions Notes/app/src/main/res/layout/note_row.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginEnd="16dp" android:layout_marginRight="16dp"
android:layout_marginEnd="@dimen/spacing_md" android:layout_marginRight="@dimen/spacing_md"
app:layout_constraintStart_toStartOf="parent"
android:layout_marginLeft="16dp" android:layout_marginStart="16dp"
android:layout_marginLeft="@dimen/spacing_md" android:layout_marginStart="@dimen/spacing_md"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginBottom="16dp">
android:layout_marginBottom="@dimen/spacing_md">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/tvTitle" android:layout_margin="16dp"/>
android:id="@+id/tvTitle" android:layout_margin="@dimen/spacing_md"/>
</androidx.cardview.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout>
6 changes: 3 additions & 3 deletions Notes/app/src/main/res/layout/notes_fragment.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
android:text="@string/notes_empty_list"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/tvEmpty" app:layout_constraintStart_toStartOf="parent" android:layout_marginLeft="8dp"
android:layout_marginStart="8dp" app:layout_constraintEnd_toEndOf="parent" android:layout_marginEnd="8dp"
android:layout_marginRight="8dp" app:layout_constraintTop_toTopOf="parent" android:layout_marginBottom="8dp"
android:id="@+id/tvEmpty" app:layout_constraintStart_toStartOf="parent" android:layout_marginLeft="@dimen/spacing_sm"
android:layout_marginStart="@dimen/spacing_sm" app:layout_constraintEnd_toEndOf="parent" android:layout_marginEnd="@dimen/spacing_sm"
android:layout_marginRight="@dimen/spacing_sm" app:layout_constraintTop_toTopOf="parent" android:layout_marginBottom="@dimen/spacing_sm"
app:layout_constraintBottom_toBottomOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>
5 changes: 5 additions & 0 deletions Notes/app/src/main/res/values/dimens.xml
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
<resources>
<dimen name="spacing_xs">6dp</dimen>
<dimen name="spacing_sm">8dp</dimen>
<dimen name="spacing_md">16dp</dimen>
<dimen name="spacing_lg">24dp</dimen>
<dimen name="spacing_xl">32dp</dimen>
</resources>
1 change: 1 addition & 0 deletions Notes/app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<string name="add_note_title">Add Note</string>
<string name="add_note_title_hint">Title</string>
<string name="add_note_description_hint">Description</string>
<string name="add_note_cancel">Cancel</string>
<string name="add_note_save">Save</string>

<string name="notes_title">Notes</string>
Expand Down

0 comments on commit 28b5bf7

Please sign in to comment.