Skip to content

Commit

Permalink
Redesign feeding element
Browse files Browse the repository at this point in the history
  • Loading branch information
@MrApplejuice
MrApplejuice committed Jun 19, 2024
1 parent 64cd0b1 commit 0eea892
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 67 deletions.
2 changes: 1 addition & 1 deletion app/src/main/java/eu/pkgsoftware/babybuddywidgets/timers/TimerControllersV2.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ class FeedingLoggingController(
if (feedingBinding.feedingTypeSpinner.isVisible && feedingBinding.feedingMethodSpinner.isVisible) {
saveButton.visibility = View.VISIBLE
} else {
saveButton.visibility = View.INVISIBLE
saveButton.visibility = View.GONE
}
}

Expand Down
123 changes: 57 additions & 66 deletions app/src/main/res/layout/feeding_logging_entry.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,67 +6,46 @@
android:layout_height="wrap_content"
android:orientation="horizontal">

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraintLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
<FrameLayout
android:id="@+id/sleepIcon"
android:layout_width="48dp"
android:layout_height="0dp"
android:layout_margin="8dp"
android:background="@color/feeding_enabled"
android:padding="8dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">

<FrameLayout
android:id="@+id/sleepIcon"
android:layout_width="48dp"
android:layout_height="48dp"
android:background="@color/feeding_enabled"
android:padding="8dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">

<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitCenter"
android:src="@drawable/pkg_bottle"
android:tintMode="src_in"
android:visibility="visible"
app:tint="@color/fixed_color_button_text_color" />
</FrameLayout>

<ImageButton
android:id="@+id/sendButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:layout_marginBottom="8dp"
android:layout_marginTop="8dp"
android:layout_weight="0"
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitCenter"
android:src="@drawable/pkg_bottle"
android:tintMode="src_in"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@android:drawable/ic_menu_save" />
app:tint="@color/fixed_color_button_text_color" />
</FrameLayout>

<TextView
android:id="@+id/currentTimerTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_weight="0"
android:text="1:10:00"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
app:layout_constraintBottom_toBottomOf="@+id/sendButton"
app:layout_constraintEnd_toStartOf="@+id/sendButton"
app:layout_constraintTop_toTopOf="@+id/sendButton" />
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/currentTimerTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="24dp"
android:layout_marginTop="8dp"
android:layout_weight="0"
android:text="1:10:00"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/constraintLayout"
tools:layout_editor_absoluteX="0dp">
android:layout_marginStart="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/sleepIcon"
app:layout_constraintTop_toTopOf="parent">

<EditText
android:id="@+id/noteEditor"
Expand All @@ -80,13 +59,25 @@
android:minLines="1"
android:selectAllOnFocus="false"
android:singleLine="false"
app:layout_constraintTop_toBottomOf="@id/feedingTypeGroup" />
app:layout_constraintTop_toBottomOf="@+id/sendButton" />


<ImageButton
android:id="@+id/sendButton"
android:layout_width="56dp"
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:layout_weight="0"
android:visibility="visible"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/feedingTypeGroup"
app:srcCompat="@android:drawable/ic_menu_save" />

<LinearLayout
android:id="@+id/feedingTypeGroup"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical"
Expand Down Expand Up @@ -124,18 +115,6 @@

</LinearLayout>

<eu.pkgsoftware.babybuddywidgets.widgets.HorizontalDecIncEditor
android:id="@+id/amountNumberPicker"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginStart="16dp"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="@+id/amountText"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/amountText"
app:layout_constraintTop_toTopOf="@+id/amountText" />

<TextView
android:id="@+id/amountText"
android:layout_width="wrap_content"
Expand All @@ -146,5 +125,17 @@
android:textAppearance="@android:style/TextAppearance.DeviceDefault.Widget.TextView.SpinnerItem"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<eu.pkgsoftware.babybuddywidgets.widgets.HorizontalDecIncEditor
android:id="@+id/amountNumberPicker"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:visibility="visible"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/amountText" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

0 comments on commit 0eea892

Please sign in to comment.