3 Commits

Author SHA1 Message Date
f01ea7f571 weight: add local unit to dialog 2026-06-11 21:20:30 +02:00
d6c79431b4 sleep: remove plus/minus buttons
Make the UI simpler.
2026-06-11 20:44:33 +02:00
0566116913 NumberUtils: remove unused numberFormat 2026-06-11 20:43:01 +02:00
4 changed files with 4 additions and 28 deletions

View File

@@ -313,6 +313,9 @@ class MainActivity : AppCompatActivity() {
val weightET = dialogView.findViewById<EditText>(R.id.dialog_number_edittext)
weightET.setText(event.quantity.toString())
val unitTV = dialogView.findViewById<TextView>(R.id.dialog_number_unit)
unitTV.text = NumericUtils(this).measurement_unit_weight_base
val dateTV = dialogView.findViewById<TextView>(R.id.dialog_date_picker)
val pickedTime = dateTimePicker(event.time, dateTV)
@@ -438,8 +441,6 @@ class MainActivity : AppCompatActivity() {
val durationButtons = dialogView.findViewById<LinearLayout>(R.id.duration_buttons)
val durationNowButton = dialogView.findViewById<Button>(R.id.dialog_date_duration_now)
val durationClearButton = dialogView.findViewById<Button>(R.id.dialog_date_duration_clear)
val durationMinus5Button = dialogView.findViewById<Button>(R.id.dialog_date_duration_minus5)
val durationPlus5Button = dialogView.findViewById<Button>(R.id.dialog_date_duration_plus5)
val currentDurationTextColor = durationTextView.currentTextColor
val invalidDurationTextColor = ContextCompat.getColor(this, R.color.danger)
@@ -513,16 +514,6 @@ class MainActivity : AppCompatActivity() {
updateFields()
durationMinus5Button.setOnClickListener {
durationEnd = (durationEnd - 300).coerceAtLeast(durationStart)
updateFields()
}
durationPlus5Button.setOnClickListener {
durationEnd = (durationEnd + 300).coerceAtLeast(durationStart)
updateFields()
}
durationClearButton.setOnClickListener {
durationEnd = durationStart
updateFields()

View File

@@ -11,7 +11,6 @@ import utils.DateUtils.Companion.formatTimeDuration
import java.text.NumberFormat
class NumericUtils (val context: Context) {
val numberFormat: NumberFormat
val measurement_unit_liquid_base: String
val measurement_unit_weight_base: String
val measurement_unit_weight_tiny: String
@@ -35,7 +34,6 @@ class NumericUtils (val context: Context) {
}
init {
this.numberFormat = NumberFormat.getInstance()
this.measurement_unit_liquid_base = context.getString(
if (isMetricSystem())
R.string.measurement_unit_liquid_base_metric

View File

@@ -24,13 +24,6 @@
android:layout_marginHorizontal="10dp"
android:orientation="horizontal">
<Button
android:id="@+id/dialog_date_duration_minus5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/dialog_duration_button_minus_5"/>
<Button
android:id="@+id/dialog_date_duration_now"
android:layout_width="wrap_content"
@@ -45,13 +38,6 @@
android:layout_weight="1"
android:text="@string/dialog_duration_button_clear"/>
<Button
android:id="@+id/dialog_date_duration_plus5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/dialog_duration_button_plus_5"/>
</LinearLayout>
<LinearLayout

View File

@@ -21,6 +21,7 @@
android:background="@drawable/textview_background"/>
<TextView
android:id="@+id/dialog_number_unit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"