Skip to content

Commit

Permalink
Tune layout, fix AutoHGrid
Browse files Browse the repository at this point in the history
  • Loading branch information
@MrApplejuice
MrApplejuice committed May 27, 2024
1 parent 6e779ca commit b810d09
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 56 deletions.
3 changes: 2 additions & 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 @@ -2,6 +2,7 @@ package eu.pkgsoftware.babybuddywidgets.timers

import android.os.Handler
import android.view.View
import android.view.ViewGroup
import android.widget.AdapterView
import android.widget.ArrayAdapter
import android.widget.Button
Expand Down Expand Up @@ -608,7 +609,7 @@ class FeedingLoggingController(

private fun populateButtonList(
textArray: Array<CharSequence>,
buttons: LinearLayout,
buttons: ViewGroup,
spinner: Spinner,
callback: ButtonListCallback
) {
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/eu/pkgsoftware/babybuddywidgets/widgets/AutoHGrid.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ class AutoHGrid : ViewGroup {
private fun computeRows(width: Int): List<RowData> {
val placeableChildren = children.filter { it.visibility != View.GONE }.toList()

var rows = mutableListOf(mutableListOf<View>())
var rowWidths = mutableListOf<Int>()
val rows = mutableListOf(mutableListOf<View>())
val rowWidths = mutableListOf<Int>()

val spacing = Tools.dpToPx(context, rowSpacing)

Expand Down Expand Up @@ -158,7 +158,7 @@ class AutoHGrid : ViewGroup {
val spacing = Tools.dpToPx(context, rowSpacing)

val rows = computeRows(width)
var currentY = t
var currentY = 0
for (row in rows) {
var currentX = (width - row.width) / 2
for (child in row.children) {
Expand Down
73 changes: 33 additions & 40 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,17 +6,6 @@
android:layout_height="wrap_content"
android:orientation="horizontal">

<TextView
android:id="@+id/currentTimerTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="100dp"
android:layout_weight="0"
android:text="1:10:00"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/constraintLayout" />

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraintLayout"
android:layout_width="match_parent"
Expand Down Expand Up @@ -57,23 +46,32 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toEndOf="@+id/solidButtonGroup"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@android:drawable/ic_menu_save" />

<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>

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@+id/currentTimerTime"
app:layout_constraintTop_toBottomOf="@id/constraintLayout"
tools:layout_editor_absoluteX="0dp">

<EditText
android:id="@+id/noteEditor"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_weight="1"
android:gravity="top|left"
android:hint="@string/activity_notes_hint"
Expand All @@ -89,13 +87,11 @@
android:id="@+id/feedingTypeGroup"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical"
app:layout_constraintTop_toBottomOf="@id/amountNumberPicker">
app:layout_constraintTop_toBottomOf="@id/amountNumberPicker"
tools:layout_editor_absoluteX="8dp">

<Spinner
android:id="@+id/feedingTypeSpinner"
Expand All @@ -105,52 +101,49 @@
android:layout_marginTop="8dp"
android:entries="@array/feedingTypes" />

<LinearLayout
android:id="@+id/feedingTypeButtons"
<Spinner
android:id="@+id/feedingMethodSpinner"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:gravity="center"
android:orientation="vertical" />
android:entries="@array/feedingMethods"
android:visibility="gone"
tools:visibility="visible" />

<LinearLayout
<eu.pkgsoftware.babybuddywidgets.widgets.AutoHGrid
android:id="@+id/feedingMethodButtons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:gravity="center"
android:orientation="vertical"
android:visibility="gone" />
tools:visibility="visible" />

<Spinner
android:id="@+id/feedingMethodSpinner"
<eu.pkgsoftware.babybuddywidgets.widgets.AutoHGrid
android:id="@+id/feedingTypeButtons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginTop="8dp"
android:entries="@array/feedingMethods"
android:visibility="gone" />
tools:visibility="visible" />

</LinearLayout>

<eu.pkgsoftware.babybuddywidgets.widgets.HorizontalDecIncEditor
android:id="@+id/amountNumberPicker"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginStart="16dp"
android:visibility="visible"
app:layout_constraintTop_toBottomOf="@id/amountText" />
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"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:text="Amount"
android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:textAppearance="@android:style/TextAppearance.DeviceDefault.Widget.TextView.SpinnerItem"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
Expand Down
25 changes: 13 additions & 12 deletions app/src/main/res/layout/generic_timer_logging_entry.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,6 @@
app:layout_constraintTop_toBottomOf="@+id/additional_controls"
tools:layout_editor_absoluteX="32dp" />

<TextView
android:id="@+id/currentTimerTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="100dp"
android:layout_weight="0"
android:text="1:10:00"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/constraintLayout2" />

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraintLayout2"
android:layout_width="match_parent"
Expand Down Expand Up @@ -121,6 +110,17 @@
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@android:drawable/ic_menu_save" />

<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>

<LinearLayout
Expand All @@ -130,6 +130,7 @@
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/currentTimerTime"></LinearLayout>
app:layout_constraintTop_toBottomOf="@id/constraintLayout2">
</LinearLayout>

</androidx.constraintlayout.widget.ConstraintLayout>

0 comments on commit b810d09

Please sign in to comment.